fix: Blank map when starting app using cordova-android branch which h…

…as upgraded AGP to 4.1.3 Original credits goes to @ebhsgit (mapsplugin/cordova-plugin-googlemaps#2871)
4sh · Dec 21, 2021 · 4e7b436 · 4e7b436
1 parent c7e60a0
commit 4e7b436
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/android/plugin/google/maps/CordovaGoogleMaps.java b/src/android/plugin/google/maps/CordovaGoogleMaps.java
@@ -448,15 +448,13 @@ public void getMap(final JSONArray args, final CallbackContext callbackContext)
  //------------------------------------------
  JSONObject meta = args.getJSONObject(0);
  String mapId = meta.getString("__pgmId");
- PluginMap pluginMap = new PluginMap();
- pluginMap.privateInitialize(mapId, cordova, webView, null);
- pluginMap.initialize(cordova, webView);
- pluginMap.mapCtrl = CordovaGoogleMaps.this;
- pluginMap.self = pluginMap;
 
+ PluginMap pluginMap = new PluginMap();
  PluginEntry pluginEntry = new PluginEntry(mapId, pluginMap);
  pluginManager.addService(pluginEntry);
 
+ pluginMap.mapCtrl = CordovaGoogleMaps.this;
+ pluginMap.self = pluginMap;
  pluginMap.getMap(args, callbackContext);
  }
 
@@ -470,14 +468,12 @@ public void getPanorama(final JSONArray args, final CallbackContext callbackCont
  String mapId = meta.getString("__pgmId");
  Log.d(TAG, "---> mapId = " + mapId);
  PluginStreetViewPanorama pluginStreetView = new PluginStreetViewPanorama();
- pluginStreetView.privateInitialize(mapId, cordova, webView, null);
- pluginStreetView.initialize(cordova, webView);
- pluginStreetView.mapCtrl = CordovaGoogleMaps.this;
- pluginStreetView.self = pluginStreetView;
-
  PluginEntry pluginEntry = new PluginEntry(mapId, pluginStreetView);
  pluginManager.addService(pluginEntry);
 
+ pluginStreetView.mapCtrl = CordovaGoogleMaps.this;
+ pluginStreetView.self = pluginStreetView;
+
  pluginStreetView.getPanorama(args, callbackContext);
  }
 

diff --git a/src/android/plugin/google/maps/PluginMap.java b/src/android/plugin/google/maps/PluginMap.java
@@ -613,9 +613,6 @@ public synchronized void loadPlugin(final JSONArray args, final CallbackContext
  plugins.put(pluginName, pluginEntry);
  mapCtrl.pluginManager.addService(pluginEntry);
 
- plugin.privateInitialize(pluginName, cordova, webView, null);
-
- plugin.initialize(cordova, webView);
  ((MyPluginInterface)plugin).setPluginMap(PluginMap.this);
  MyPlugin myPlugin = (MyPlugin) plugin;
  myPlugin.self = (MyPlugin)plugin;
@@ -666,8 +663,6 @@ public void create(final JSONArray args, final CallbackContext callbackContext)
  pluginMap = PluginMap.this;
  pluginMap.mapCtrl.pluginManager.addService(pluginEntry);
 
- plugin.privateInitialize(className, cordova, webView, null);
- plugin.initialize(cordova, webView);
  ((MyPluginInterface)plugin).setPluginMap(PluginMap.this);
  pluginEntry.plugin.execute("create", args, callbackContext);