Ver código fonte

commit after rebase

Guy Carmeli 9 anos atrás
pai
commit
55ce8422e7

+ 1
- 2
android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java Ver arquivo

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

+ 0
- 2
android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java Ver arquivo

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