Merge pull request #505 from edenman/dev

Don't crash if REQUEST_KEY bundle is null
facebook · Aug 31, 2017 · a98fb74 · a98fb74
2 parents c491bb4 + 482ad05
commit a98fb74
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/facebook/src/main/java/com/facebook/login/LoginFragment.java b/facebook/src/main/java/com/facebook/login/LoginFragment.java
@@ -78,10 +78,12 @@ public void onCompleted(LoginClient.Result outcome) {
         }
 
         initializeCallingPackage(activity);
-        if (activity.getIntent() != null) {
-            Intent intent = activity.getIntent();
+        Intent intent = activity.getIntent();
+        if (intent != null) {
             Bundle bundle = intent.getBundleExtra(REQUEST_KEY);
-            request = bundle.getParcelable(EXTRA_REQUEST);
+            if (bundle != null) {
+                request = bundle.getParcelable(EXTRA_REQUEST);
+            }
         }
     }