Merge pull request #482 from opengisch/revert_importDirectoryProject_…

…to_str
opengisch · Feb 11, 2023 · ecf1f1a · ecf1f1a
2 parents 64bc8f3 + 4b520f1
commit ecf1f1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/qfieldsync/core/preferences.py b/qfieldsync/core/preferences.py
@@ -23,7 +23,7 @@ def __init__(self):
         self.add_setting(
             String("importDirectory", Scope.Global, str(home.joinpath("QField/import")))
         )
-        self.add_setting(Dictionary("importDirectoryProject", Scope.Project, {}))
+        self.add_setting(String("importDirectoryProject", Scope.Project, None))
         self.add_setting(Dictionary("importDirsToCopy", Scope.Global, {}))
         self.add_setting(Stringlist("attachmentDirs", Scope.Project, ["DCIM"]))
         self.add_setting(Dictionary("qfieldCloudProjectLocalDirs", Scope.Global, {}))

diff --git a/qfieldsync/gui/synchronize_dialog.py b/qfieldsync/gui/synchronize_dialog.py
@@ -65,10 +65,7 @@ def __init__(self, iface, offline_editing, parent=None):
         self.button_box.button(QDialogButtonBox.Save).clicked.connect(
             lambda: self.start_synchronization()
         )
-        try:
-            import_dir = self.preferences.value("importDirectoryProject")
-        except ValueError:
-            import_dir = None
+        import_dir = self.preferences.value("importDirectoryProject")
         if not import_dir:
             import_dir = self.preferences.value("importDirectory")