Use model/Folder defaults for the camera folder (fixes #352) (#353)

Catfriend1 · Mar 6, 2019 · e57caf9 · e57caf9
1 parent 4b2dfd3
commit e57caf9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
@@ -963,6 +963,7 @@ private boolean changeLocalDeviceName(String localDeviceID) {
      * Returns if changes to the config have been made.
      */
     private boolean changeDefaultFolder() {
+        Folder defaultFolder = new Folder();
         Element folder = (Element) mConfig.getDocumentElement()
                 .getElementsByTagName("folder").item(0);
         String deviceModel = Build.MODEL
@@ -975,8 +976,9 @@ private boolean changeDefaultFolder() {
         folder.setAttribute("path", Environment
                 .getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath());
         folder.setAttribute("type", Constants.FOLDER_TYPE_SEND_ONLY);
-        folder.setAttribute("fsWatcherEnabled", "true");
-        folder.setAttribute("fsWatcherDelayS", "10");
+        folder.setAttribute("fsWatcherEnabled", Boolean.toString(defaultFolder.fsWatcherEnabled));
+        folder.setAttribute("fsWatcherDelayS", Integer.toString(defaultFolder.fsWatcherDelayS));
+        setConfigElement(folder, "useLargeBlocks", Boolean.toString(defaultFolder.useLargeBlocks));
         return true;
     }