jeduan#568: Fix null pointer exception crashing app after 2nd login

miloproductionsinc · Apr 28, 2018 · c2178fc · c2178fc
1 parent 476a328
commit c2178fc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="2.0.1"></a>
+# [2.0.1](https://github.com/jeduan/cordova-plugin-facebook4/releases/tag/v2.0.1)
+
+## Bug fixes
+
+* **Android:** Fix null pointer exception leading to app crashing after a second login (flow example: login -> graphApi -> logout -> login -> crash) ([#568](https://github.com/jeduan/cordova-plugin-facebook4/issues/568))
+
 <a name="2.0.0"></a>
 # [2.0.0](https://github.com/jeduan/cordova-plugin-facebook4/releases/tag/v2.0.0)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-facebook4",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Cordova Facebook SDK 4 Plugin",
   "cordova": {
     "id": "cordova-plugin-facebook4",

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-facebook4"
-        version="2.0.0">
+        version="2.0.1">
 
     <name>Facebook Connect</name>
 

diff --git a/src/android/ConnectPlugin.java b/src/android/ConnectPlugin.java
@@ -21,7 +21,6 @@
 import com.facebook.applinks.AppLinkData;
 import com.facebook.login.LoginManager;
 import com.facebook.login.LoginResult;
-import com.facebook.share.ShareApi;
 import com.facebook.share.Sharer;
 import com.facebook.share.model.GameRequestContent;
 import com.facebook.share.model.ShareHashtag;
@@ -634,6 +633,10 @@ private void executeLogEvent(JSONArray args, CallbackContext callbackContext) th
 
     private void executeLogin(JSONArray args, CallbackContext callbackContext) throws JSONException {
         Log.d(TAG, "login FB");
+
+        // #568: Reset lastGraphContext in case it would still contains the last graphApi results of a previous session (login -> graphApi -> logout -> login)
+        lastGraphContext = null;
+
         // Get the permissions
         Set<String> permissions = new HashSet<String>(args.length());