Add null check for Jetpack connect source to magic link classes

woocommerce · Apr 20, 2018 · 398eb4d · 398eb4d
1 parent 8069afc
commit 398eb4d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/...essLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java b/...essLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java
@@ -241,10 +241,14 @@ public void onStop() {
     }
 
     private AuthEmailPayloadSource getAuthEmailPayloadSource() {
-        if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.NOTIFICATIONS.toString())) {
-            return AuthEmailPayloadSource.NOTIFICATIONS;
-        } else if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.STATS.toString())) {
-            return AuthEmailPayloadSource.STATS;
+        if (mJetpackConnectSource != null) {
+            if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.NOTIFICATIONS.toString())) {
+                return AuthEmailPayloadSource.NOTIFICATIONS;
+            } else if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.STATS.toString())) {
+                return AuthEmailPayloadSource.STATS;
+            } else {
+                return null;
+            }
         } else {
             return null;
         }

diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupMagicLinkFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupMagicLinkFragment.java
@@ -202,10 +202,14 @@ protected void sendMagicLinkEmail() {
     }
 
     private AuthEmailPayloadSource getAuthEmailPayloadSource() {
-        if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.NOTIFICATIONS.toString())) {
-            return AuthEmailPayloadSource.NOTIFICATIONS;
-        } else if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.STATS.toString())) {
-            return AuthEmailPayloadSource.STATS;
+        if (mJetpackConnectSource != null) {
+            if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.NOTIFICATIONS.toString())) {
+                return AuthEmailPayloadSource.NOTIFICATIONS;
+            } else if (mJetpackConnectSource.equalsIgnoreCase(AuthEmailPayloadSource.STATS.toString())) {
+                return AuthEmailPayloadSource.STATS;
+            } else {
+                return null;
+            }
         } else {
             return null;
         }