Fix port as -1 if dev server without specifying port on Android

Kudo · Sep 16, 2022 · 4beb8f6 · 4beb8f6
1 parent 1cdeb20
commit 4beb8f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
@@ -22,9 +22,8 @@
 import com.facebook.react.R;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Locale;
+import okhttp3.HttpUrl;
 
 /** Controller to display loading messages on top of the screen. All methods are thread safe. */
 public class DevLoadingViewController {
@@ -61,17 +60,17 @@ public void showForUrl(String url) {
       return;
     }
 
-    URL parsedURL;
+    HttpUrl parsedURL;
     try {
-      parsedURL = new URL(url);
-    } catch (MalformedURLException e) {
+      parsedURL = HttpUrl.get(url);
+    } catch (IllegalArgumentException e) {
       FLog.e(ReactConstants.TAG, "Bundle url format is invalid. \n\n" + e.toString());
       return;
     }
 
     showMessage(
         context.getString(
-            R.string.catalyst_loading_from_url, parsedURL.getHost() + ":" + parsedURL.getPort()));
+            R.string.catalyst_loading_from_url, parsedURL.host() + ":" + parsedURL.port()));
   }
 
   public void showForRemoteJSEnabled() {

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
@@ -57,13 +57,12 @@
 import com.facebook.react.packagerconnection.RequestHandler;
 import com.facebook.react.packagerconnection.Responder;
 import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import okhttp3.HttpUrl;
 
 public abstract class DevSupportManagerBase implements DevSupportManager {
 
@@ -700,14 +699,14 @@ private void resetCurrentContext(@Nullable ReactContext reactContext) {
 
     if (mCurrentContext != null) {
       try {
-        URL sourceUrl = new URL(getSourceUrl());
-        String path = sourceUrl.getPath().substring(1); // strip initial slash in path
-        String host = sourceUrl.getHost();
-        int port = sourceUrl.getPort();
+        HttpUrl sourceUrl = HttpUrl.get(getSourceUrl());
+        String path = sourceUrl.encodedPath().substring(1); // strip initial slash in path
+        String host = sourceUrl.host();
+        int port = sourceUrl.port();
         mCurrentContext
             .getJSModule(HMRClient.class)
             .setup("android", path, host, port, mDevSettings.isHotModuleReplacementEnabled());
-      } catch (MalformedURLException e) {
+      } catch (IllegalArgumentException e) {
         showNewJavaError(e.getMessage(), e);
       }
     }