Merge branch 'dev' of https://github.com/omkarmoghe/Pokemap into dev

akirafong · Jul 29, 2016 · da451bb · da451bb
2 parents b5228a4 + 0b8ad2c
commit da451bb
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/...ain/java/com/omkarmoghe/pokemap/controllers/app_preferences/PokemapSharedPreferences.java b/...ain/java/com/omkarmoghe/pokemap/controllers/app_preferences/PokemapSharedPreferences.java
@@ -4,6 +4,7 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
 
@@ -63,16 +64,18 @@ public LoginInfo getLoginInfo() {
                 String password = null;
 
                 for (String s :info) {
-                    if(s.contains(INFO_TOKEN)){
-                        token = getStoredString(s);
-                        continue;
-                    }
-                    if(s.contains(INFO_USERNAME)){
-                        username = getStoredString(s);
-                        continue;
-                    }
-                    if(s.contains(INFO_PASSWORD)){
-                        password = getStoredString(s);
+                    if(!TextUtils.isEmpty(s)) {
+                        if (s.contains(INFO_TOKEN)) {
+                            token = getStoredString(s);
+                            continue;
+                        }
+                        if (s.contains(INFO_USERNAME)) {
+                            username = getStoredString(s);
+                            continue;
+                        }
+                        if (s.contains(INFO_PASSWORD)) {
+                            password = getStoredString(s);
+                        }
                     }
                 }
                 return new PtcLoginInfo(token, username, password);
@@ -88,12 +91,14 @@ public LoginInfo getLoginInfo() {
                 String refresh = null;
 
                 for (String s :info) {
-                    if(s.contains(INFO_TOKEN)){
-                        token = getStoredString(s);
-                        continue;
-                    }
-                    if(s.contains(INFO_PASSWORD)){
-                        refresh = getStoredString(s);
+                    if(!TextUtils.isEmpty(s)) {
+                        if (s.contains(INFO_TOKEN)) {
+                            token = getStoredString(s);
+                            continue;
+                        }
+                        if (s.contains(INFO_PASSWORD)) {
+                            refresh = getStoredString(s);
+                        }
                     }
                 }