feat(android): add packager connection check (#26)

callstack · Nov 19, 2019 · b39e8a0 · b39e8a0
1 parent 2aecb60
commit b39e8a0
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeActivity.kt b/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeActivity.kt
@@ -13,6 +13,7 @@ import com.facebook.react.devsupport.DoubleTapReloadRecognizer
 import com.facebook.react.modules.core.PermissionListener
 import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.common.DebugServerException
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 import com.facebook.react.modules.core.PermissionAwareActivity
 
@@ -39,10 +40,9 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
         )
 
         supportActionBar?.hide()
-
         setContentView(reactRootView)
-
         doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
+        checkPackagerConnection()
     }
 
     override fun onDestroy() {
@@ -145,6 +145,21 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
         }
     }
 
+    private fun checkPackagerConnection() {
+        if (ReactNativeBrownfield.shared.reactNativeHost.hasInstance() && ReactNativeBrownfield.shared.reactNativeHost.useDeveloperSupport) {
+            val devSupportManager =
+                    ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.devSupportManager
+            val url = devSupportManager.sourceUrl
+            devSupportManager?.isPackagerRunning { isRunning ->
+                if (!isRunning) {
+                    val error = Error()
+                    val message = DebugServerException.makeGeneric(url, "Could not connect to development server.", "URL: $url", error).message
+                    devSupportManager.showNewJavaError(message, error)
+                }
+            }
+        }
+    }
+
     companion object {
         @JvmStatic
         @JvmOverloads