Skip to content

Commit d358862

Browse files
committed
Try MinDiskFree.value as Long instead of Integer
1 parent ca3931b commit d358862

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static class Versioning implements Serializable {
5151
}
5252

5353
public static class MinDiskFree {
54-
public Integer value = 1;
54+
public Long value = 1l;
5555
public String unit = "%";
5656
}
5757

app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,14 @@ private Integer getContentOrDefault(final Node node, Integer defaultValue) {
393393
}
394394
}
395395

396+
private Long getContentOrDefault(final Node node, Long defaultValue) {
397+
try {
398+
return (node == null) ? defaultValue : Long.parseLong(node.getTextContent());
399+
} catch (NumberFormatException e) {
400+
return defaultValue;
401+
}
402+
}
403+
396404
private Float getContentOrDefault(final Node node, Float defaultValue) {
397405
try {
398406
return (node == null) ? defaultValue : Float.parseFloat(node.getTextContent());
@@ -453,7 +461,7 @@ public List<Folder> getFolders() {
453461
folder.minDiskFree = new Folder.MinDiskFree();
454462
Element elementMinDiskFree = (Element) r.getElementsByTagName("minDiskFree").item(0);
455463
folder.minDiskFree.unit = getAttributeOrDefault(elementMinDiskFree, "unit", "%");
456-
folder.minDiskFree.value = getContentOrDefault(elementMinDiskFree, 1);
464+
folder.minDiskFree.value = getContentOrDefault(elementMinDiskFree, 1l);
457465
// Log.v(TAG, "folder.minDiskFree.unit=" + folder.minDiskFree.unit + ", folder.minDiskFree.value=" + folder.minDiskFree.value);
458466

459467
// Versioning
@@ -557,7 +565,7 @@ public void updateFolder(final Folder folder) {
557565
r.appendChild(nodeMinDiskFree);
558566
elementMinDiskFree = (Element) nodeMinDiskFree;
559567
elementMinDiskFree.setAttribute("unit", folder.minDiskFree.unit);
560-
setConfigElement(r, "minDiskFree", Integer.toString(folder.minDiskFree.value));
568+
setConfigElement(r, "minDiskFree", Long.toString(folder.minDiskFree.value));
561569
}
562570

563571
// Versioning

0 commit comments

Comments
 (0)