From be6aab9849e16c279d480c32bd478361f41047fe Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 5 Oct 2015 17:24:54 -0700
Subject: #560 Fix parseInt failing on empty string

---
 .../github/daneren2005/dsub/service/parser/AbstractParser.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java')

diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/AbstractParser.java b/app/src/main/java/github/daneren2005/dsub/service/parser/AbstractParser.java
index 9ecbba52..664adcfb 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/AbstractParser.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/parser/AbstractParser.java
@@ -23,6 +23,7 @@ import java.io.Reader;
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
+import android.util.Log;
 import android.util.Xml;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.ServerInfo;
@@ -34,7 +35,7 @@ import github.daneren2005.dsub.util.Util;
  * @author Sindre Mehus
  */
 public abstract class AbstractParser {
-
+    private static final String TAG = AbstractParser.class.getSimpleName();
     protected final Context context;
 	protected final int instance;
     private XmlPullParser parser;
@@ -101,7 +102,12 @@ public abstract class AbstractParser {
 
     protected Integer getInteger(String name) {
         String s = get(name);
-        return s == null ? null : Integer.valueOf(s);
+        try {
+            return (s == null || "".equals(s)) ? null : Integer.valueOf(s);
+        } catch(Exception e) {
+            Log.w(TAG, "Failed to parse " + s + " into integer");
+            return null;
+        }
     }
 
     protected Long getLong(String name) {
-- 
cgit v1.2.3