Browse Source

Clear RctManager when ReactInstanceManager is destroyed

Guy Carmeli 8 years ago
parent
commit
7dfbf3d169

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java View File

@@ -208,6 +208,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
208 208
         if (mReactInstanceManager != null && (activity == null || activity.isFinishing())) {
209 209
             Log.i(TAG, "Destroying ReactInstanceManager");
210 210
             mReactInstanceManager.onHostDestroy();
211
+            RctManager.getInstance().onDestroy();
211 212
         } else {
212 213
             Log.d(TAG, "Not destroying ReactInstanceManager");
213 214
         }

+ 5
- 0
android/app/src/main/java/com/reactnativenavigation/core/RctManager.java View File

@@ -108,5 +108,10 @@ public class RctManager {
108 108
 
109 109
         return currentReactContext.getJSModule(RCTDeviceEventEmitter.class);
110 110
     }
111
+
112
+    public void onDestroy() {
113
+        mReactManager = null;
114
+        sInstance = null;
115
+    }
111 116
 }
112 117