Try MinDiskFree.value as Long instead of Integer

Catfriend1 · Jan 26, 2019 · d358862 · d358862
1 parent ca3931b
commit d358862
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java b/app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java
@@ -51,7 +51,7 @@ public static class Versioning implements Serializable {
     }
 
     public static class MinDiskFree {
-        public Integer value = 1;
+        public Long value = 1l;
         public String unit = "%";
     }
 

diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
@@ -393,6 +393,14 @@ private Integer getContentOrDefault(final Node node, Integer defaultValue) {
         }
     }
 
+    private Long getContentOrDefault(final Node node, Long defaultValue) {
+        try {
+            return (node == null) ? defaultValue : Long.parseLong(node.getTextContent());
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
+    }
+
     private Float getContentOrDefault(final Node node, Float defaultValue) {
         try {
             return (node == null) ? defaultValue : Float.parseFloat(node.getTextContent());
@@ -453,7 +461,7 @@ public List<Folder> getFolders() {
             folder.minDiskFree = new Folder.MinDiskFree();
             Element elementMinDiskFree = (Element) r.getElementsByTagName("minDiskFree").item(0);
             folder.minDiskFree.unit = getAttributeOrDefault(elementMinDiskFree, "unit", "%");
-            folder.minDiskFree.value = getContentOrDefault(elementMinDiskFree, 1);
+            folder.minDiskFree.value = getContentOrDefault(elementMinDiskFree, 1l);
             // Log.v(TAG, "folder.minDiskFree.unit=" + folder.minDiskFree.unit + ", folder.minDiskFree.value=" + folder.minDiskFree.value);
 
             // Versioning
@@ -557,7 +565,7 @@ public void updateFolder(final Folder folder) {
                     r.appendChild(nodeMinDiskFree);
                     elementMinDiskFree = (Element) nodeMinDiskFree;
                     elementMinDiskFree.setAttribute("unit", folder.minDiskFree.unit);
-                    setConfigElement(r, "minDiskFree", Integer.toString(folder.minDiskFree.value));
+                    setConfigElement(r, "minDiskFree", Long.toString(folder.minDiskFree.value));
                 }
 
                 // Versioning