Model/Folder: Use Integer instead of Float

See gson glitch: google/gson#1290 google/gson#968
Catfriend1 · Jan 26, 2019 · ca3931b · ca3931b
1 parent 47f3a8d
commit ca3931b
Show file tree

Hide file tree

Showing 2 changed files with 3 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 float value = 1;
+        public Integer value = 1;
         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
@@ -453,7 +453,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, 1f);
+            folder.minDiskFree.value = getContentOrDefault(elementMinDiskFree, 1);
             // Log.v(TAG, "folder.minDiskFree.unit=" + folder.minDiskFree.unit + ", folder.minDiskFree.value=" + folder.minDiskFree.value);
 
             // Versioning
@@ -557,7 +557,7 @@ public void updateFolder(final Folder folder) {
                     r.appendChild(nodeMinDiskFree);
                     elementMinDiskFree = (Element) nodeMinDiskFree;
                     elementMinDiskFree.setAttribute("unit", folder.minDiskFree.unit);
-                    setConfigElement(r, "minDiskFree", Float.toString(folder.minDiskFree.value));
+                    setConfigElement(r, "minDiskFree", Integer.toString(folder.minDiskFree.value));
                 }
 
                 // Versioning