Browse Source

createAdditionalReactPackages now nullable

Daniel Zlotin 8 years ago
parent
commit
4db262d461

+ 5
- 2
android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java View File

2
 
2
 
3
 import android.app.Application;
3
 import android.app.Application;
4
 import android.os.Handler;
4
 import android.os.Handler;
5
-import android.support.annotation.NonNull;
5
+import android.support.annotation.Nullable;
6
 
6
 
7
 import com.facebook.react.ReactPackage;
7
 import com.facebook.react.ReactPackage;
8
 import com.facebook.react.bridge.ReactContext;
8
 import com.facebook.react.bridge.ReactContext;
50
 
50
 
51
     private void addAdditionalReactPackagesIfNeeded(List<ReactPackage> list) {
51
     private void addAdditionalReactPackagesIfNeeded(List<ReactPackage> list) {
52
         List<ReactPackage> additionalReactPackages = createAdditionalReactPackages();
52
         List<ReactPackage> additionalReactPackages = createAdditionalReactPackages();
53
+        if (additionalReactPackages == null) {
54
+            return;
55
+        }
53
 
56
 
54
         for (ReactPackage reactPackage : additionalReactPackages) {
57
         for (ReactPackage reactPackage : additionalReactPackages) {
55
             if (reactPackage instanceof MainReactPackage)
58
             if (reactPackage instanceof MainReactPackage)
79
 
82
 
80
     public abstract boolean isDebug();
83
     public abstract boolean isDebug();
81
 
84
 
82
-    @NonNull
85
+    @Nullable
83
     public abstract List<ReactPackage> createAdditionalReactPackages();
86
     public abstract List<ReactPackage> createAdditionalReactPackages();
84
 
87
 
85
     public void sendNavigatorEvent(String eventId, String navigatorEventId) {
88
     public void sendNavigatorEvent(String eventId, String navigatorEventId) {