Remove Tramp "obex" and "synce" methods

* doc/misc/tramp.texi (GVFS based methods): Remove `obex' and `synce'.

* etc/NEWS: Mention obsolete Tramp "obex" and "synce" methods.

* lisp/net/tramp-gvfs.el (tramp-gvfs-methods):
Remove "obex" and "synce".
(top): Do not add defaults for "obex" and "synce".
(tramp-bluez-service, tramp-bluez-interface-manager)
(tramp-bluez-interface-adapter)
(tramp-bluez-discover-devices-timeout, tramp-bluez-discovery)
(tramp-bluez-devices, tramp-hal-service, tramp-hal-path-manager)
(tramp-hal-interface-manager, tramp-hal-interface-device)
(tramp-bluez-address, tramp-bluez-device)
(tramp-bluez-list-devices, tramp-bluez-property-changed)
(tramp-bluez-device-found, tramp-bluez-parse-device-names)
(tramp-synce-list-devices, tramp-synce-parse-device-names): Remove.
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec): Do not
handle "obex" and "synce".

3 files changed, 19 insertions, 314 deletions

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 29626138ae1..83585038a8f 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1110,13 +1110,6 @@ Since Google Drive uses cryptic blob file names internally,
 could produce unexpected behavior in case two files in the same
 directory have the same @code{display-name}, such a situation must be avoided.
 
-@item @option{obex}
-@cindex method @option{obex}
-@cindex @option{obex} method
-
-OBEX is an FTP-like access protocol for cell phones and similar simple
-devices.  @value{tramp} supports OBEX over Bluetooth.
-
 @item @option{owncloud}
 @cindex @acronym{GNOME} Online Accounts
 @cindex method @option{owncloud}
@@ -1137,24 +1130,16 @@ This method uses @command{sftp} in order to securely access remote
 hosts.  @command{sftp} is a more secure option for connecting to hosts
 that for security reasons refuse @command{ssh} connections.
 
-@item @option{synce}
-@cindex method @option{synce}
-@cindex @option{synce} method
-
-@option{synce} method allows connecting to MS Windows Mobile devices.
-It uses GVFS for mounting remote files and directories via FUSE and
-requires the SYNCE-GVFS plugin.
-
 @end table
 
 @defopt tramp-gvfs-methods
 This user option is a list of external methods for GVFS@.  By default,
 this list includes @option{afp}, @option{dav}, @option{davs},
-@option{gdrive}, @option{obex}, @option{owncloud}, @option{sftp} and
-@option{synce}.  Other methods to include are @option{ftp},
-@option{http}, @option{https} and @option{smb}.  These methods are not
-intended to be used directly as GVFS based method.  Instead, they are
-added here for the benefit of @ref{Archive file names}.
+@option{gdrive}, @option{owncloud} and @option{sftp}.  Other methods
+to include are @option{ftp}, @option{http}, @option{https} and
+@option{smb}.  These methods are not intended to be used directly as
+GVFS based method.  Instead, they are added here for the benefit of
+@ref{Archive file names}.
 @end defopt
 
 
diff --git a/etc/NEWS b/etc/NEWS
index 01dcb441a7d..d6b7485f7ff 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -430,6 +430,10 @@ process.  It now accepts signals specified either by name or by its number.
 or NextCloud hosted files and directories.
 
 +++
+*** Connection methods "obex" and "synce" are removed, because they
+are obsoleted in GVFS.
+
++++
 *** Validated passwords are saved by auth-source backends which support this.
 
 +++
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index f547f84a17e..87c0c796b69 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -49,10 +49,7 @@
 
 ;; The user option `tramp-gvfs-methods' contains the list of supported
 ;; connection methods.  Per default, these are "afp", "dav", "davs",
-;; "gdrive", "obex", "owncloud", "sftp" and "synce".  Note that with
-;; "obex" it might be necessary to pair with the other bluetooth
-;; device, if it hasn't been done already.  There might be also some
-;; few seconds delay in discovering available bluetooth devices.
+;; "gdrive", "owncloud" and "sftp".
 
 ;; "gdrive" and "owncloud" connection methods require a respective
 ;; account in GNOME Online Accounts, with enabled "Files" service.
@@ -83,18 +80,14 @@
 ;; request an additional connection method to be supported, please
 ;; drop me a note.
 
-;; For hostname completion, information is retrieved either from the
-;; bluez daemon (for the "obex" method), the hal daemon (for the
-;; "synce" method), or from the zeroconf daemon (for the "afp", "dav",
-;; "davs", and "sftp" methods).  The zeroconf daemon is pre-configured
-;; to discover services in the "local" domain.  If another domain
-;; shall be used for discovering services, the user option
-;; `tramp-gvfs-zeroconf-domain' can be set accordingly.
+;; For hostname completion, information is retrieved from the zeroconf
+;; daemon (for the "afp", "dav", "davs", and "sftp" methods).  The
+;; zeroconf daemon is pre-configured to discover services in the
+;; "local" domain.  If another domain shall be used for discovering
+;; services, the user option `tramp-gvfs-zeroconf-domain' can be set
+;; accordingly.
 
 ;; Restrictions:
-
-;; * The current GVFS implementation does not allow writing on the
-;;   remote bluetooth device via OBEX.
 ;;
 ;; * Two shares of the same SMB server cannot be mounted in parallel.
 
@@ -128,10 +121,10 @@
 
 ;;;###tramp-autoload
 (defcustom tramp-gvfs-methods
-  '("afp" "dav" "davs" "gdrive" "obex" "owncloud" "sftp" "synce")
+  '("afp" "dav" "davs" "gdrive" "owncloud" "sftp")
   "List of methods for remote files, accessed with GVFS."
   :group 'tramp
-  :version "26.1"
+  :version "27.1"
   :type '(repeat (choice (const "afp")
                          (const "dav")
                          (const "davs")
@@ -139,11 +132,9 @@
                          (const "gdrive")
                          (const "http")
                          (const "https")
-                         (const "obex")
                          (const "owncloud")
                          (const "sftp")
-                         (const "smb")
-                         (const "synce"))))
+                         (const "smb"))))
 
 (defconst tramp-goa-methods '("gdrive" "owncloud")
   "List of methods which require registration at GNOME Online Accounts.")
@@ -162,8 +153,6 @@
                `("\\`gdrive\\'" nil ,(match-string 1 user-mail-address)))
   (add-to-list 'tramp-default-host-alist
                '("\\`gdrive\\'" nil ,(match-string 2 user-mail-address))))
-;;;###tramp-autoload
-(add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil))
 
 ;;;###tramp-autoload
 (defcustom tramp-gvfs-zeroconf-domain "local"
@@ -463,132 +452,6 @@ It has been changed in GVFS 1.14.")
 ;; in order to be compatible with Emacs 24 and 25.
 (cl-defstruct (tramp-goa-name (:type list) :named) method user host port)
 
-(defconst tramp-bluez-service "org.bluez"
-  "The well known name of the BLUEZ service.")
-
-(defconst tramp-bluez-interface-manager "org.bluez.Manager"
-  "The manager interface of the BLUEZ daemon.")
-
-;; <interface name='org.bluez.Manager'>
-;;   <method name='DefaultAdapter'>
-;;     <arg type='o' direction='out'/>
-;;   </method>
-;;   <method name='FindAdapter'>
-;;     <arg type='s' direction='in'/>
-;;     <arg type='o' direction='out'/>
-;;   </method>
-;;   <method name='ListAdapters'>
-;;     <arg type='ao' direction='out'/>
-;;   </method>
-;;   <signal name='AdapterAdded'>
-;;     <arg type='o'/>
-;;   </signal>
-;;   <signal name='AdapterRemoved'>
-;;     <arg type='o'/>
-;;   </signal>
-;;   <signal name='DefaultAdapterChanged'>
-;;     <arg type='o'/>
-;;   </signal>
-;; </interface>
-
-(defconst tramp-bluez-interface-adapter "org.bluez.Adapter"
-  "The adapter interface of the BLUEZ daemon.")
-
-;; <interface name='org.bluez.Adapter'>
-;;   <method name='GetProperties'>
-;;     <arg type='a{sv}' direction='out'/>
-;;   </method>
-;;   <method name='SetProperty'>
-;;     <arg type='s' direction='in'/>
-;;     <arg type='v' direction='in'/>
-;;   </method>
-;;   <method name='RequestMode'>
-;;     <arg type='s' direction='in'/>
-;;   </method>
-;;   <method name='ReleaseMode'/>
-;;   <method name='RequestSession'/>
-;;   <method name='ReleaseSession'/>
-;;   <method name='StartDiscovery'/>
-;;   <method name='StopDiscovery'/>
-;;   <method name='ListDevices'>
-;;     <arg type='ao' direction='out'/>
-;;   </method>
-;;   <method name='CreateDevice'>
-;;     <arg type='s' direction='in'/>
-;;     <arg type='o' direction='out'/>
-;;   </method>
-;;   <method name='CreatePairedDevice'>
-;;     <arg type='s' direction='in'/>
-;;     <arg type='o' direction='in'/>
-;;     <arg type='s' direction='in'/>
-;;     <arg type='o' direction='out'/>
-;;   </method>
-;;   <method name='CancelDeviceCreation'>
-;;     <arg type='s' direction='in'/>
-;;   </method>
-;;   <method name='RemoveDevice'>
-;;     <arg type='o' direction='in'/>
-;;   </method>
-;;   <method name='FindDevice'>
-;;     <arg type='s' direction='in'/>
-;;     <arg type='o' direction='out'/>
-;;   </method>
-;;   <method name='RegisterAgent'>
-;;     <arg type='o' direction='in'/>
-;;     <arg type='s' direction='in'/>
-;;   </method>
-;;   <method name='UnregisterAgent'>
-;;     <arg type='o' direction='in'/>
-;;   </method>
-;;   <signal name='DeviceCreated'>
-;;     <arg type='o'/>
-;;   </signal>
-;;   <signal name='DeviceRemoved'>
-;;     <arg type='o'/>
-;;   </signal>
-;;   <signal name='DeviceFound'>
-;;     <arg type='s'/>
-;;     <arg type='a{sv}'/>
-;;   </signal>
-;;   <signal name='PropertyChanged'>
-;;     <arg type='s'/>
-;;     <arg type='v'/>
-;;   </signal>
-;;   <signal name='DeviceDisappeared'>
-;;     <arg type='s'/>
-;;   </signal>
-;; </interface>
-
-;;;###tramp-autoload
-(defcustom tramp-bluez-discover-devices-timeout 60
-  "Defines seconds since last bluetooth device discovery before rescanning.
-A value of 0 would require an immediate discovery during hostname
-completion, nil means to use always cached values for discovered
-devices."
-  :group 'tramp
-  :version "23.2"
-  :type '(choice (const nil) integer))
-
-(defvar tramp-bluez-discovery nil
-  "Indicator for a running bluetooth device discovery.
-It keeps the timestamp of last discovery.")
-
-(defvar tramp-bluez-devices nil
-  "Alist of detected bluetooth devices.
-Every entry is a list (NAME ADDRESS).")
-
-(defconst tramp-hal-service "org.freedesktop.Hal"
-  "The well known name of the HAL service.")
-
-(defconst tramp-hal-path-manager "/org/freedesktop/Hal/Manager"
-  "The object path of the HAL daemon manager.")
-
-(defconst tramp-hal-interface-manager "org.freedesktop.Hal.Manager"
-  "The manager interface of the HAL daemon.")
-
-(defconst tramp-hal-interface-device "org.freedesktop.Hal.Device"
-  "The device interface of the HAL daemon.")
-
 ;; "gvfs-<command>" utilities have been deprecated in GVFS 1.31.1.  We
 ;; must use "gio <command>" tool instead.
 (defconst tramp-gvfs-gio-mapping
@@ -1675,8 +1538,6 @@ file-notify events."
                    (cadr (assoc "uri" (cadr mount-spec))))))
         (when (string-match "^\\(afp\\|smb\\)" method)
           (setq method (match-string 1 method)))
-        (when (string-equal "obex" method)
-          (setq host (tramp-bluez-device host)))
         (when (and (string-equal "dav" method) (string-equal "true" ssl))
           (setq method "davs"))
         (when (and (string-equal "davs" method)
@@ -1766,8 +1627,6 @@ file-notify events."
                        (cadr (assoc "volume" (cadr mount-spec)))))))
          (when (string-match "^\\(afp\\|smb\\)" method)
            (setq method (match-string 1 method)))
-         (when (string-equal "obex" method)
-           (setq host (tramp-bluez-device host)))
          (when (and (string-equal "dav" method) (string-equal "true" ssl))
            (setq method "davs"))
          (when (and (string-equal "davs" method)
@@ -1776,8 +1635,6 @@ file-notify events."
            (setq method "owncloud"))
          (when (string-equal "google-drive" method)
            (setq method "gdrive"))
-         (when (and (string-equal "synce" method) (zerop (length user)))
-           (setq user (or (tramp-file-name-user vec) "")))
          (when (and (string-equal "http" method) (stringp uri))
            (setq uri (url-generic-parse-url uri)
                  method (url-type uri)
@@ -1837,10 +1694,6 @@ It was \"a(say)\", but has changed to \"a{sv})\"."
                 (list (tramp-gvfs-mount-spec-entry "type" "smb-share")
                       (tramp-gvfs-mount-spec-entry "server" host)
                       (tramp-gvfs-mount-spec-entry "share" share)))
-               ((string-equal "obex" method)
-                (list (tramp-gvfs-mount-spec-entry "type" method)
-                      (tramp-gvfs-mount-spec-entry
-                       "host" (concat "[" (tramp-bluez-address host) "]"))))
                ((string-match "^dav\\|^owncloud" method)
                 (list (tramp-gvfs-mount-spec-entry "type" "dav")
                       (tramp-gvfs-mount-spec-entry "host" host)
@@ -2139,103 +1992,6 @@ VEC is used only for traces."
              (tramp-get-connection-property key "Uri" "file:///"))))))))))
 
 
-;; D-Bus BLUEZ functions.
-
-(defun tramp-bluez-address (device)
-  "Return bluetooth device address from a given bluetooth DEVICE name."
-  (when (stringp device)
-    (if (string-match tramp-ipv6-regexp device)
-        (match-string 0 device)
-      (cadr (assoc device (tramp-bluez-list-devices))))))
-
-(defun tramp-bluez-device (address)
-  "Return bluetooth device name from a given bluetooth device ADDRESS.
-ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"."
-  (when (stringp address)
-    (while (string-match "[][]" address)
-      (setq address (replace-match "" t t address)))
-    (let (result)
-      (dolist (item (tramp-bluez-list-devices) result)
-        (when (string-match address (cadr item))
-          (setq result (car item)))))))
-
-(defun tramp-bluez-list-devices ()
-  "Return all discovered bluetooth devices as list.
-Every entry is a list (NAME ADDRESS).
-
-If `tramp-bluez-discover-devices-timeout' is an integer, and the last
-discovery happened more time before indicated there, a rescan will be
-started, which lasts some ten seconds.  Otherwise, cached results will
-be used."
-  ;; Reset the scanned devices list if time has passed.
-  (and (integerp tramp-bluez-discover-devices-timeout)
-       (integerp tramp-bluez-discovery)
-       (> (tramp-time-diff (current-time) tramp-bluez-discovery)
-          tramp-bluez-discover-devices-timeout)
-       (setq tramp-bluez-devices nil))
-
-  ;; Rescan if needed.
-  (unless tramp-bluez-devices
-    (let ((object-path
-           (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t
-             :system tramp-bluez-service "/"
-             tramp-bluez-interface-manager "DefaultAdapter")))
-      (setq tramp-bluez-devices nil
-            tramp-bluez-discovery t)
-      (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector nil
-        :system tramp-bluez-service object-path
-        tramp-bluez-interface-adapter "StartDiscovery")
-      (while tramp-bluez-discovery
-        (read-event nil nil 0.1))))
-  (setq tramp-bluez-discovery (current-time))
-  (tramp-message tramp-gvfs-dbus-event-vector 10 "%s" tramp-bluez-devices)
-  tramp-bluez-devices)
-
-(defun tramp-bluez-property-changed (property value)
-  "Signal handler for the \"org.bluez.Adapter.PropertyChanged\" signal."
-  (tramp-message tramp-gvfs-dbus-event-vector 6 "%s %s" property value)
-  (cond
-   ((string-equal property "Discovering")
-    (unless (car value)
-      ;; "Discovering" FALSE means discovery run has been completed.
-      ;; We stop it, because we don't need another run.
-      (setq tramp-bluez-discovery nil)
-      (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t
-        :system tramp-bluez-service (dbus-event-path-name last-input-event)
-        tramp-bluez-interface-adapter "StopDiscovery")))))
-
-(when tramp-gvfs-enabled
-  (dbus-register-signal
-   :system nil nil tramp-bluez-interface-adapter "PropertyChanged"
-   'tramp-bluez-property-changed))
-
-(defun tramp-bluez-device-found (device args)
-  "Signal handler for the \"org.bluez.Adapter.DeviceFound\" signal."
-  (tramp-message tramp-gvfs-dbus-event-vector 6 "%s %s" device args)
-  (let ((alias (car (cadr (assoc "Alias" args))))
-        (address (car (cadr (assoc "Address" args)))))
-    ;; Maybe we shall check the device class for being a proper
-    ;; device, and call also SDP in order to find the obex service.
-    (add-to-list 'tramp-bluez-devices (list alias address))))
-
-(when tramp-gvfs-enabled
-  (dbus-register-signal
-   :system nil nil tramp-bluez-interface-adapter "DeviceFound"
-   'tramp-bluez-device-found))
-
-(defun tramp-bluez-parse-device-names (_ignore)
-  "Return a list of (nil host) tuples allowed to access."
-  (mapcar
-   (lambda (x) (list nil (car x)))
-   (tramp-bluez-list-devices)))
-
-;; Add completion function for OBEX method.
-(when (and tramp-gvfs-enabled
-           (member tramp-bluez-service (dbus-list-known-names :system)))
-  (tramp-set-completion-function
-   "obex" '((tramp-bluez-parse-device-names ""))))
-
-
 ;; D-Bus zeroconf functions.
 
 (defun tramp-zeroconf-parse-device-names (service)
@@ -2317,41 +2073,6 @@ This uses \"avahi-browse\" in case D-Bus is not enabled in Avahi."
           (tramp-set-completion-function
            "smb" '((tramp-gvfs-parse-device-names "_smb._tcp"))))))))
 
-
-;; D-Bus SYNCE functions.
-
-(defun tramp-synce-list-devices ()
-  "Return all discovered synce devices as list.
-They are retrieved from the hal daemon."
-  (let (tramp-synce-devices)
-    (dolist (device
-             (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t
-               :system tramp-hal-service tramp-hal-path-manager
-               tramp-hal-interface-manager "GetAllDevices"))
-      (when (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t
-              :system tramp-hal-service device tramp-hal-interface-device
-              "PropertyExists" "sync.plugin")
-        (let ((prop
-               (with-tramp-dbus-call-method
-                tramp-gvfs-dbus-event-vector t
-                :system tramp-hal-service device tramp-hal-interface-device
-                "GetPropertyString" "pda.pocketpc.name")))
-          (unless (member prop tramp-synce-devices)
-            (push prop tramp-synce-devices)))))
-    (tramp-message tramp-gvfs-dbus-event-vector 10 "%s" tramp-synce-devices)
-    tramp-synce-devices))
-
-(defun tramp-synce-parse-device-names (_ignore)
-  "Return a list of (nil host) tuples allowed to access."
-  (mapcar
-   (lambda (x) (list nil x))
-   (tramp-synce-list-devices)))
-
-;; Add completion function for SYNCE method.
-(when tramp-gvfs-enabled
-  (tramp-set-completion-function
-   "synce" '((tramp-synce-parse-device-names ""))))
-
 (add-hook 'tramp-unload-hook
           (lambda ()
             (unload-feature 'tramp-gvfs 'force)))
@@ -2368,11 +2089,6 @@ They are retrieved from the hal daemon."
 ;; * Check, how two shares of the same SMB server can be mounted in
 ;;   parallel.
 ;;
-;; * Apply SDP on bluetooth devices, in order to filter out obex
-;;   capability.
-;;
-;; * Implement obex for other serial communication but bluetooth.
-;;
 ;; * What's up with ftps dns-sd afc admin computer?
 
 ;;; tramp-gvfs.el ends here