Starting to make persistent tabs persistent

2 files changed, 7 insertions, 3 deletions

diff --git a/onionshare/mode_settings.py b/onionshare/mode_settings.py
index ffc32d06..3b14dbe8 100644
--- a/onionshare/mode_settings.py
+++ b/onionshare/mode_settings.py
@@ -28,12 +28,13 @@ class ModeSettings:
     is only one TabSettings, and in the GUI there is a separate TabSettings for each tab
     """
 
-    def __init__(self, common, filename=None):
+    def __init__(self, common, filename=None, id=None):
         self.common = common
 
         self.default_settings = {
             "persistent": {
                 "enabled": False,
+                "mode": None,
                 "private_key": None,
                 "hidservauth": None,
                 "password": None,
@@ -52,7 +53,10 @@ class ModeSettings:
         self._settings = {}
 
         self.just_created = False
-        self.id = self.common.build_password(3)
+        if id:
+            self.id = id
+        else:
+            self.id = self.common.build_password(3)
 
         self.load(filename)
 
@@ -104,7 +108,6 @@ class ModeSettings:
         if filename:
             self.filename = filename
         else:
-            # Give it a persistent filename
             self.filename = os.path.join(
                 self.common.build_persistent_dir(), f"{self.id}.json"
             )
diff --git a/onionshare/settings.py b/onionshare/settings.py
index 11227817..f9348a8e 100644
--- a/onionshare/settings.py
+++ b/onionshare/settings.py
@@ -112,6 +112,7 @@ class Settings(object):
             "tor_bridges_use_obfs4": False,
             "tor_bridges_use_meek_lite_azure": False,
             "tor_bridges_use_custom_bridges": "",
+            "persistent_tabs": [],
             "locale": None,  # this gets defined in fill_in_defaults()
         }
         self._settings = {}