From 107415fd304a68392be2fcf426601c36f3d4f2ff Mon Sep 17 00:00:00 2001 From: Catfriend1 Date: Mon, 17 Jun 2019 07:09:32 +0200 Subject: [PATCH] Follow-up to fix issue #421 unackedNotificationID=crAutoDisabled --- .../main/java/com/nutomic/syncthingandroid/model/Options.java | 1 + .../main/java/com/nutomic/syncthingandroid/util/ConfigXml.java | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java index 404a3944..0bb9f6a1 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/model/Options.java @@ -57,6 +57,7 @@ public class Options { // Items that may be temporarily missing because they are empty. /** * Possible notification IDs: + * crAutoDisabled (crash reporting after upgrade to v1.2.0) * crAutoEnabled (crash reporting after upgrade to v1.2.0) */ public String unackedNotificationID = ""; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java index 88c1e254..9d0126ad 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java @@ -311,6 +311,7 @@ public class ConfigXml { if (node.getNodeName().equals("unackedNotificationID")) { switch (getContentOrDefault(node, "")) { case "crAutoEnabled": + case "crAutoDisabled": case "fsWatcherNotification": Log.i(TAG, "Remove found unackedNotificationID '" + node + "'."); options.removeChild(node);