From 86d50d75ff0aa7edaf299f480b9c6f25f7091d50 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sat, 23 May 2015 17:31:59 +0200
Subject: [PATCH] Use optString, added link.

---
 .../com/nutomic/syncthingandroid/syncthing/RestApi.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
index f380e180..bd695280 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
@@ -529,11 +529,9 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
                 Folder r = new Folder();
                 r.path = json.getString("path");
                 r.id = json.getString("id");
-                if (json.has("invalid")) {
-                    r.invalid = json.getString("invalid"); // TODO Upstream bug
-                } else {
-                    r.invalid = "";
-                }
+                // TODO: Field seems to be missing sometimes.
+                // https://github.com/syncthing/syncthing-android/issues/291
+                r.invalid = json.optString("invalid");
                 r.deviceIds = new ArrayList<>();
                 JSONArray devices = json.getJSONArray("devices");
                 for (int j = 0; j < devices.length(); j++) {