ConfigXml: Make getOrDefault more safe by catching NumberFormatException

Catfriend1 · Jan 27, 2019 · fb07486 · fb07486
1 parent e4dae20
commit fb07486
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java b/app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
@@ -370,19 +370,35 @@ private Boolean getAttributeOrDefault(final Element element, String attribute, B
     }
 
     private Integer getAttributeOrDefault(final Element element, String attribute, Integer defaultValue) {
-        return element.hasAttribute(attribute) ? Integer.parseInt(element.getAttribute(attribute)) : defaultValue;
+        try {
+            return element.hasAttribute(attribute) ? Integer.parseInt(element.getAttribute(attribute)) : defaultValue;
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
     }
 
     private String getAttributeOrDefault(final Element element, String attribute, String defaultValue) {
         return element.hasAttribute(attribute) ? element.getAttribute(attribute) : defaultValue;
     }
 
     private Boolean getContentOrDefault(final Node node, Boolean defaultValue) {
-         return (node == null) ? defaultValue : Boolean.parseBoolean(node.getTextContent());
+        return (node == null) ? defaultValue : Boolean.parseBoolean(node.getTextContent());
     }
 
     private Integer getContentOrDefault(final Node node, Integer defaultValue) {
-         return (node == null) ? defaultValue : Integer.parseInt(node.getTextContent());
+        try {
+            return (node == null) ? defaultValue : Integer.parseInt(node.getTextContent());
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
+    }
+
+    private Float getContentOrDefault(final Node node, Float defaultValue) {
+        try {
+            return (node == null) ? defaultValue : Float.parseFloat(node.getTextContent());
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
     }
 
     private String getContentOrDefault(final Node node, String defaultValue) {