Check for potential null pointers in ActFmLoginActivity

13 years ago · d24b71c5aa
parent 0648db2026
commit d24b71c5aa
1 changed files with 2 additions and 2 deletions
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@ -625,8 +625,8 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
        if (resultCode == RESULT_CANCELED)
            return;

-        if (requestCode == REQUEST_CODE_GOOGLE_ACCOUNTS) {
-            String accounts[] = data.getExtras().getStringArray(
+        if (requestCode == REQUEST_CODE_GOOGLE_ACCOUNTS && data != null && credentialsListener != null) {
+            String accounts[] = data.getStringArrayExtra(
                    GoogleLoginServiceConstants.ACCOUNTS_KEY);
            credentialsListener.getCredentials(accounts);
        } else if (requestCode == LoginButton.REQUEST_CODE_FACEBOOK) {