|
@@ -16,27 +16,30 @@ public abstract class SplashActivity extends AppCompatActivity {
|
16
|
16
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
17
|
17
|
super.onCreate(savedInstanceState);
|
18
|
18
|
setSplashLayout();
|
|
19
|
+ }
|
19
|
20
|
|
20
|
|
- if (NavigationApplication.instance.isReactContextInitialized()) {
|
21
|
|
- finish();
|
|
21
|
+ @Override
|
|
22
|
+ protected void onResume() {
|
|
23
|
+ super.onResume();
|
|
24
|
+
|
|
25
|
+ if (NavigationApplication.instance.getReactGateway().hasStartedCreatingContext()) {
|
22
|
26
|
return;
|
23
|
27
|
}
|
24
|
28
|
|
25
|
29
|
if (ReactDevPermission.shouldAskPermission()) {
|
26
|
30
|
ReactDevPermission.askPermission(this);
|
|
31
|
+ return;
|
|
32
|
+ }
|
|
33
|
+
|
|
34
|
+ if (NavigationApplication.instance.isReactContextInitialized()) {
|
27
|
35
|
finish();
|
28
|
36
|
return;
|
29
|
37
|
}
|
30
|
38
|
|
|
39
|
+ // TODO I'm starting to think this entire flow is incorrect and should be done in Application
|
31
|
40
|
NavigationApplication.instance.startReactContextOnceInBackgroundAndExecuteJS();
|
32
|
41
|
}
|
33
|
42
|
|
34
|
|
- @Override
|
35
|
|
- protected void onPause() {
|
36
|
|
- super.onPause();
|
37
|
|
- finish();
|
38
|
|
- }
|
39
|
|
-
|
40
|
43
|
private void setSplashLayout() {
|
41
|
44
|
final int splashLayout = getSplashLayout();
|
42
|
45
|
if (splashLayout > 0) {
|