Rclone: fix missing JSON property detection

Ref: Appcenter #515743623
x0b · Jul 9, 2021 · 9dee1f6 · 9dee1f6
1 parent 96e0b16
commit 9dee1f6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/Rclone.java b/app/src/main/java/ca/pkay/rcloneexplorer/Rclone.java
@@ -364,8 +364,8 @@ private RemoteItem getRemoteType(JSONObject remotesJSON, RemoteItem remoteItem,
 
             try {
                 JSONObject remoteJSON = new JSONObject(remotesJSON.get(key).toString());
-                String type = remoteJSON.getString("type");
-                if (type == null || type.trim().isEmpty()) {
+                String type = remoteJSON.optString("type");
+                if (type.trim().isEmpty()) {
                     return null;
                 }
 
@@ -385,8 +385,8 @@ private RemoteItem getRemoteType(JSONObject remotesJSON, RemoteItem remoteItem,
                 }
 
                 if (recurse && maxDepth > 0) {
-                    String remote = remoteJSON.getString("remote");
-                    if (remote == null || (!remote.contains(":") && !remote.startsWith("/"))) {
+                    String remote = remoteJSON.optString("remote");
+                    if (remote.trim().isEmpty() || (!remote.contains(":") && !remote.startsWith("/"))) {
                         return null;
                     }