Inject localUrlJS before bridgeJS

ionic-team · Jun 21, 2021 · e46a0a0 · e46a0a0
1 parent d171a84
commit e46a0a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/Bridge.java b/android/capacitor/src/main/java/com/getcapacitor/Bridge.java
@@ -756,14 +756,14 @@ public <I, O> ActivityResultLauncher<I> registerForActivityResult(
     private JSInjector getJSInjector() {
         try {
             String globalJS = JSExport.getGlobalJS(context, config.isLoggingEnabled(), isDevMode());
+            String localUrlJS = "window.WEBVIEW_SERVER_URL = '" + localUrl + "';";
             String bridgeJS = JSExport.getBridgeJS(context);
             String pluginJS = JSExport.getPluginJS(plugins.values());
             String cordovaJS = JSExport.getCordovaJS(context);
             String cordovaPluginsJS = JSExport.getCordovaPluginJS(context);
             String cordovaPluginsFileJS = JSExport.getCordovaPluginsFileJS(context);
-            String localUrlJS = "window.WEBVIEW_SERVER_URL = '" + localUrl + "';";
 
-            return new JSInjector(globalJS, bridgeJS, pluginJS, cordovaJS, cordovaPluginsJS, cordovaPluginsFileJS, localUrlJS);
+            return new JSInjector(globalJS, localUrlJS, bridgeJS, pluginJS, cordovaJS, cordovaPluginsJS, cordovaPluginsFileJS);
         } catch (Exception ex) {
             Logger.error("Unable to export Capacitor JS. App will not function!", ex);
         }

diff --git a/android/capacitor/src/main/java/com/getcapacitor/JSInjector.java b/android/capacitor/src/main/java/com/getcapacitor/JSInjector.java
@@ -14,29 +14,29 @@
 class JSInjector {
 
     private String globalJS;
+    private String localUrlJS;
     private String bridgeJS;
     private String pluginJS;
     private String cordovaJS;
     private String cordovaPluginsJS;
     private String cordovaPluginsFileJS;
-    private String localUrlJS;
 
     public JSInjector(
         String globalJS,
+        String localUrlJS
         String bridgeJS,
         String pluginJS,
         String cordovaJS,
         String cordovaPluginsJS,
         String cordovaPluginsFileJS,
-        String localUrlJS
     ) {
         this.globalJS = globalJS;
+        this.localUrlJS = localUrlJS;
         this.bridgeJS = bridgeJS;
         this.pluginJS = pluginJS;
         this.cordovaJS = cordovaJS;
         this.cordovaPluginsJS = cordovaPluginsJS;
         this.cordovaPluginsFileJS = cordovaPluginsFileJS;
-        this.localUrlJS = localUrlJS;
     }
 
     /**
@@ -48,6 +48,8 @@ public String getScriptString() {
         return (
             globalJS +
             "\n\n" +
+            localUrlJS +
+            "\n\n" +
             bridgeJS +
             "\n\n" +
             pluginJS +
@@ -56,9 +58,7 @@ public String getScriptString() {
             "\n\n" +
             cordovaPluginsFileJS +
             "\n\n" +
-            cordovaPluginsJS +
-            "\n\n" +
-            localUrlJS
+            cordovaPluginsJS
         );
     }