Quellcode durchsuchen

commit after rebase

Guy Carmeli vor 9 Jahren
Ursprung
Commit
55ce8422e7

+ 1
- 2
android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java Datei anzeigen

@@ -1,6 +1,5 @@
1 1
 package com.reactnativenavigation.activities;
2 2
 
3
-import android.app.Activity;
4 3
 import android.content.Intent;
5 4
 import android.os.Build;
6 5
 import android.os.Bundle;
@@ -192,7 +191,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
192 191
 
193 192
         // Destroy react instance manager only if there are no resumed react activities
194 193
         BaseReactActivity activity = ContextProvider.getActivityContext();
195
-        if (mReactInstanceManager != null ) {
194
+        if (mReactInstanceManager != null && activity!=null && activity.isFinishing()) {
196 195
             Log.i(TAG, "Destroying ReactInstanceManager");
197 196
             mReactInstanceManager.onDestroy();
198 197
         } else {

+ 0
- 2
android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java Datei anzeigen

@@ -34,7 +34,6 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
34 34
 
35 35
     @ReactMethod
36 36
     public void startTabBasedApp(ReadableArray screens) {
37
-        Log.e("START", "NEW_TAB");
38 37
         Activity context = ContextProvider.getActivityContext();
39 38
         if (context != null && !context.isFinishing()) {
40 39
             Intent intent = new Intent(context, TabActivity.class);
@@ -55,7 +54,6 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
55 54
 
56 55
     @ReactMethod
57 56
     public void startSingleScreenApp(ReadableMap screen) {
58
-        Log.e("START", "NEW_SINGLE");
59 57
         BaseReactActivity context = ContextProvider.getActivityContext();
60 58
         if (context != null && !context.isFinishing()) {
61 59
             Intent intent = new Intent(context, SingleScreenActivity.class);