Commit 9f1e80cd authored by mathieui's avatar mathieui

Remove force_remote_bookmarks option

It is 2021, servers ought to not be broken that much.
parent b2c846f9
Pipeline #3593 passed with stages
in 5 minutes
......@@ -132,10 +132,6 @@ use_bookmarks_method =
# possible values are: anything/false
#use_remote_bookmarks = true
# Force the retrieval of the remote bookmarks even when the server
# doesn't advertise support for your method
#force_remote_bookmarks = false
# Whether you want all bookmarks, even those without
# autojoin, to be open on startup
#open_all_bookmarks = false
......
......@@ -384,13 +384,6 @@ to understand what is :ref:`carbons <carbons-details>` or
This was previously named ``bookmark_on_join``.
force_remote_bookmarks
**Default value:** ``false``
Try to retrieve your remote bookmarks, even when your server doesn’t advertise
support.
use_bookmark_method
**Default value:** ``[empty]``
......
......@@ -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:
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment