Default folder path: Home shortcut (~) broken (#1197)

Catfriend1 · Dec 10, 2024 · a0d9628 · a0d9628
1 parent be41010
commit a0d9628
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java
@@ -50,6 +50,7 @@
 import com.nutomic.syncthingandroid.model.SystemStatus;
 import com.nutomic.syncthingandroid.model.SystemVersion;
 import com.nutomic.syncthingandroid.service.Constants;
+import com.nutomic.syncthingandroid.util.FileUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -594,6 +595,11 @@ public List<Folder> getFolders() {
         synchronized (mConfigLock) {
             folders = deepCopy(mConfig.folders, new TypeToken<List<Folder>>(){}.getType());
         }
+        for (Folder folder : folders) {
+            if (folder.path.startsWith("~/")) {
+                folder.path = folder.path.replaceFirst("^~", FileUtils.getInternalStorageRootAbsolutePath());
+            }
+        }
         Collections.sort(folders, FOLDERS_COMPARATOR);
         return folders;
     }

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
@@ -467,7 +467,12 @@ public List<Folder> getFolders() {
             Folder folder = new Folder();
             folder.id = getAttributeOrDefault(r, "id", "");
             folder.label = getAttributeOrDefault(r, "label", folder.label);
+
             folder.path = getAttributeOrDefault(r, "path", "");
+            if (folder.path.startsWith("~/")) {
+                folder.path = folder.path.replaceFirst("^~", FileUtils.getInternalStorageRootAbsolutePath());
+            }
+
             folder.type = getAttributeOrDefault(r, "type", Constants.FOLDER_TYPE_SEND_RECEIVE);
             folder.autoNormalize = getAttributeOrDefault(r, "autoNormalize", folder.autoNormalize);
             folder.fsWatcherDelayS =getAttributeOrDefault(r, "fsWatcherDelayS", folder.fsWatcherDelayS);

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java b/app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java
@@ -307,6 +307,14 @@ public static void deleteDirectoryRecursively(java.nio.file.Path pathToDelete) t
             .map(java.nio.file.Path::toFile)
             .forEach(File::delete);
     }
+
+    /**
+     * Expands the "~" path.
+     * Result: e.g. /storage/emulated/0
+     */
+    public static String getInternalStorageRootAbsolutePath() {
+        return Environment.getExternalStorageDirectory().getAbsolutePath();
+    }
 
     /**
      * Derives the mime type from file extension.