Split selectBottomTab into two methods to prevent passing null parameters

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -76,8 +76,13 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void selectBottomTab(String navigatorId, Integer index) {
-        NavigationCommandsHandler.selectBottomTab(navigatorId, index);
+    public void selectBottomTabByTabIndex(Integer index) {
+        NavigationCommandsHandler.selectBottomTabByTabIndex(index);
+    }
+
+    @ReactMethod
+    public void selectBottomTabByNavigatorId(String navigatorId) {
+        NavigationCommandsHandler.selectBottomTabByNavigatorId(navigatorId);
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -213,9 +213,15 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         layout.setSideMenuVisible(animated, visible);
     }
 
-    public void selectBottomTab(String navigatorId, Integer index) {
+    public void selectBottomTabByTabIndex(Integer index) {
         if (layout instanceof BottomTabsLayout) {
-            ((BottomTabsLayout) layout).selectBottomTab(navigatorId, index);
+            ((BottomTabsLayout) layout).selectBottomTabByTabIndex(index);
+        }
+    }
+
+    public void selectBottomTabByNavigatorId(String navigatorId) {
+        if (layout instanceof BottomTabsLayout) {
+            ((BottomTabsLayout) layout).selectBottomTabByNavigatorId(navigatorId);
         }
     }
 }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -239,7 +239,7 @@ public class NavigationCommandsHandler {
         });
     }
 
-    public static void selectBottomTab(final String navigatorId, final Integer index) {
+    public static void selectBottomTabByTabIndex(final Integer index) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;
@@ -248,7 +248,21 @@ public class NavigationCommandsHandler {
         NavigationApplication.instance.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                currentActivity.selectBottomTab(navigatorId, index);
+                currentActivity.selectBottomTabByTabIndex(index);
+            }
+        });
+    }
+
+    public static void selectBottomTabByNavigatorId(final String navigatorId) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.selectBottomTabByNavigatorId(navigatorId);
             }
         });
     }

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -164,12 +164,12 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         }
     }
 
-    public void selectBottomTab(String navigatorId, Integer index) {
-        if (index != null) {
-            bottomTabs.setCurrentItem(index);
-        } else {
-            bottomTabs.setCurrentItem(getScreenStackIndex(navigatorId));
-        }
+    public void selectBottomTabByTabIndex(Integer index) {
+        bottomTabs.setCurrentItem(index);
+    }
+
+    public void selectBottomTabByNavigatorId(String navigatorId) {
+        bottomTabs.setCurrentItem(getScreenStackIndex(navigatorId));
     }
 
     @Override

src/deprecated/platformSpecificDeprecated.android.js

@@ -243,7 +243,12 @@ function navigatorSetTitle(navigator, params) {
 }
 
 function navigatorSwitchToTab(navigator, params) {
-  newPlatformSpecific.selectBottomTab(navigator.navigatorID, params.tabIndex);
+  debugger;
+  if (params.tabIndex >= 0) {
+    newPlatformSpecific.selectBottomTabByTabIndex(params.tabIndex);
+  } else {
+    newPlatformSpecific.selectBottomTabByNavigatorId(navigator.navigatorID);
+  }
 }
 
 function navigatorToggleDrawer(navigator, params) {

src/platformSpecific.android.js

@@ -92,8 +92,12 @@ function setSideMenuVisible(animated, visible) {
   NativeReactModule.setSideMenuVisible(animated, visible);
 }
 
-function selectBottomTab(navigatorId, index) {
-  NativeReactModule.selectBottomTab(navigatorId, index);
+function selectBottomTabByNavigatorId(navigatorId) {
+  NativeReactModule.selectBottomTabByNavigatorId(navigatorId);
+}
+
+function selectBottomTabByTabIndex(index) {
+  NativeReactModule.selectBottomTabByTabIndex(index);
 }
 
 module.exports = {
@@ -111,5 +115,6 @@ module.exports = {
   dismissAllModals,
   toggleSideMenuVisible,
   setSideMenuVisible,
-  selectBottomTab
+  selectBottomTabByNavigatorId,
+  selectBottomTabByTabIndex
 };