Fix crash for AccessToken tracker (#699)

This PR fixes Crash when handling access token by tracking access token when react context is ready
facebookarchive · Jan 30, 2020 · 2294213 · 2294213
1 parent cfee77a
commit 2294213
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/android/src/main/java/com/facebook/reactnative/androidsdk/FBAccessTokenModule.java b/android/src/main/java/com/facebook/reactnative/androidsdk/FBAccessTokenModule.java
@@ -44,14 +44,7 @@ public class FBAccessTokenModule extends ReactContextBaseJavaModule {
     public static final String CHANGE_EVENT_NAME = "fbsdk.accessTokenDidChange";
 
     private final ReactApplicationContext mReactContext;
-    private final AccessTokenTracker accessTokenTracker = new AccessTokenTracker() {
-        @Override
-        protected void onCurrentAccessTokenChanged(AccessToken oldAccessToken, AccessToken currentAccessToken) {
-            mReactContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                    .emit(CHANGE_EVENT_NAME, currentAccessToken == null ? null : Utility.accessTokenToReactMap(currentAccessToken));
-        }
-    };
+    private AccessTokenTracker accessTokenTracker;
 
     public FBAccessTokenModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -62,6 +55,26 @@ public String getName() {
         return NAME;
     }
 
+    @Override
+    public void initialize() {
+        super.initialize();
+        accessTokenTracker = new AccessTokenTracker() {
+            @Override
+            protected void onCurrentAccessTokenChanged(AccessToken oldAccessToken, AccessToken currentAccessToken) {
+                mReactContext
+                        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                        .emit(CHANGE_EVENT_NAME, currentAccessToken == null ? null : Utility.accessTokenToReactMap(currentAccessToken));
+            }
+        };
+
+    }
+
+    @Override
+    public void onCatalystInstanceDestroy() {
+        super.onCatalystInstanceDestroy();
+        accessTokenTracker.stopTracking();
+    }
+
     /**
      * Get {@link AccessToken} of the current session.
      * @param callback Use callback to pass the current access token back to JS.