From 6cecaf9e8cf2e8fa6b36476f028a44337503c16d Mon Sep 17 00:00:00 2001
From: maskara <maskara@zeta.tech>
Date: Sun, 12 Mar 2017 14:18:41 +0530
Subject: [PATCH] Fixes #426: Crash fix caused by NPE

---
 app/src/main/java/fr/free/nrw/commons/Utils.java         | 4 ++++
 .../commons/modifications/ModificationsSyncAdapter.java  | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index f07d5c8bd..8a4391a02 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -312,4 +312,8 @@ public class Utils {
         }
         return title;
     }
+
+    public static boolean isNullOrWhiteSpace(String value) {
+        return value == null || value.trim().isEmpty();
+    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
index e91b52a93..b17162705 100644
--- a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
@@ -49,13 +49,16 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
         String authCookie;
         try {
              authCookie = AccountManager.get(getContext()).blockingGetAuthToken(account, "", false);
-        } catch (OperationCanceledException e) {
+        } catch (OperationCanceledException | AuthenticatorException e) {
             throw new RuntimeException(e);
         } catch (IOException e) {
             Log.d("Commons", "Could not authenticate :(");
             return;
-        } catch (AuthenticatorException e) {
-            throw new RuntimeException(e);
+        }
+
+        if(Utils.isNullOrWhiteSpace(authCookie)) {
+            Log.d("Commons", "Could not authenticate :(");
+            return;
         }
 
         MWApi api = CommonsApplication.createMWApi();