Remove force_remote_bookmarks option

It is 2021, servers ought to not be broken that much.

2 files changed, 1 insertions, 18 deletions

diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py
index 4ce06cf0..d95e8fd5 100644
--- a/poezio/bookmarks.py
+++ b/poezio/bookmarks.py
@@ -279,25 +279,9 @@ class BookmarkList:
 
     def get_remote(self, xmpp, information, callback):
         """Add the remotely stored bookmarks to the list."""
-        force = config.get('force_remote_bookmarks')
-        if xmpp.anon or not (any(self.available_storage.values()) or force):
+        if xmpp.anon or not any(self.available_storage.values()):
             information('No remote bookmark storage available', 'Warning')
             return
-
-        if force and not any(self.available_storage.values()):
-            old_callback = callback
-            method = 'pep' if self.preferred == 'pep' else 'privatexml'
-
-            def new_callback(result):
-                if result['type'] != 'error':
-                    self.available_storage[method] = True
-                    old_callback(result)
-                else:
-                    information('No remote bookmark storage available',
-                                'Warning')
-
-            callback = new_callback
-
         if self.preferred == 'pep':
             self.get_pep(xmpp, callback=callback)
         else:
diff --git a/poezio/config.py b/poezio/config.py
index 78581775..00d0b2f7 100644
--- a/poezio/config.py
+++ b/poezio/config.py
@@ -73,7 +73,6 @@ DEFAULT_CONFIG = {
         'extract_inline_images': True,
         'filter_info_messages': '',
         'force_encryption': True,
-        'force_remote_bookmarks': False,
         'go_to_previous_tab_on_alt_number': False,
         'group_corrections': True,
         'hide_exit_join': -1,