Browse Source

adapting to the new API

Daniel Zlotin 8 years ago
parent
commit
40f775e48a

+ 10
- 23
android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java View File

@@ -18,64 +18,51 @@ import java.util.List;
18 18
 public class NavigationReactGateway extends ReactGatewayHost implements ReactInstanceManager.ReactInstanceEventListener {
19 19
 
20 20
     private OnJsDevReloadListener onJsDevReloadListener;
21
-    private ReactInstanceManager reactInstanceManager;
22 21
     private NavigationReactEventEmitter reactEventEmitter;
23 22
 
24 23
     public NavigationReactGateway() {
25 24
         super(NavigationApplication.instance);
26
-        reactInstanceManager = createReactInstanceManager();
27 25
     }
28 26
 
29 27
     @Override
30 28
     public void startReactContextOnceInBackgroundAndExecuteJS() {
31
-        if (reactInstanceManager == null) {
32
-            reactInstanceManager = createReactInstanceManager();
33
-        }
34
-
35
-        if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
36
-            reactInstanceManager.createReactContextInBackground();
37
-        }
29
+        getReactInstanceManager().createReactContextInBackground();
38 30
     }
39 31
 
40 32
     public boolean isInitialized() {
41
-        return reactInstanceManager != null && reactInstanceManager.getCurrentReactContext() != null;
33
+        return hasInstance() && getReactInstanceManager().getCurrentReactContext() != null;
42 34
     }
43 35
 
44 36
     public ReactContext getReactContext() {
45
-        return reactInstanceManager.getCurrentReactContext();
37
+        return getReactInstanceManager().getCurrentReactContext();
46 38
     }
47 39
 
48 40
     public NavigationReactEventEmitter getReactEventEmitter() {
49 41
         return reactEventEmitter;
50 42
     }
51 43
 
52
-    public ReactInstanceManager getReactInstanceManager() {
53
-        return reactInstanceManager;
54
-    }
55
-
56 44
     public void onBackPressed() {
57
-        reactInstanceManager.onBackPressed();
45
+        getReactInstanceManager().onBackPressed();
58 46
     }
59 47
 
60 48
     public void onDestroyApp() {
61
-        reactInstanceManager.onHostDestroy();
62
-        reactInstanceManager.destroy();
63
-        reactInstanceManager.removeReactInstanceEventListener(this);
64
-        reactInstanceManager = null;
49
+        getReactInstanceManager().onHostDestroy();
50
+        getReactInstanceManager().removeReactInstanceEventListener(this);
51
+        clear();
65 52
     }
66 53
 
67 54
     public void onPauseActivity() {
68
-        reactInstanceManager.onHostPause();
55
+        getReactInstanceManager().onHostPause();
69 56
         onJsDevReloadListener = null;
70 57
     }
71 58
 
72 59
     public void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener) {
73 60
         this.onJsDevReloadListener = onJsDevReloadListener;
74
-        reactInstanceManager.onHostResume(activity, defaultHardwareBackBtnHandler);
61
+        getReactInstanceManager().onHostResume(activity, defaultHardwareBackBtnHandler);
75 62
     }
76 63
 
77 64
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
78
-        reactInstanceManager.onActivityResult(requestCode, resultCode, data);
65
+        getReactInstanceManager().onActivityResult(requestCode, resultCode, data);
79 66
     }
80 67
 
81 68
     private void replaceJsDevReloadListener(ReactInstanceManager manager) {