From 25ac2eb09fdf0937ec1076527a78f26c35fc8bd7 Mon Sep 17 00:00:00 2001 From: Nestor Santana <92853078+efidatansantana@users.noreply.github.com> Date: Fri, 4 Aug 2023 10:17:32 +0200 Subject: [PATCH 1/6] Update PluginMap.java init plugin.cordova = null; to null to prevent enter on assert null of cordova plugin. --- src/android/plugin/google/maps/PluginMap.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/android/plugin/google/maps/PluginMap.java b/src/android/plugin/google/maps/PluginMap.java index a3d379f0e..4b5f18419 100644 --- a/src/android/plugin/google/maps/PluginMap.java +++ b/src/android/plugin/google/maps/PluginMap.java @@ -613,6 +613,7 @@ public synchronized void loadPlugin(final JSONArray args, final CallbackContext plugins.put(pluginName, pluginEntry); mapCtrl.pluginManager.addService(pluginEntry); + plugin.cordova = null; // avoid failure caused by repreated initialization plugin.privateInitialize(pluginName, cordova, webView, null); plugin.initialize(cordova, webView); @@ -666,6 +667,8 @@ public void create(final JSONArray args, final CallbackContext callbackContext) pluginMap = PluginMap.this; pluginMap.mapCtrl.pluginManager.addService(pluginEntry); + plugin.cordova = null; // avoid failure caused by repreated initialization + plugin.privateInitialize(className, cordova, webView, null); plugin.initialize(cordova, webView); ((MyPluginInterface)plugin).setPluginMap(PluginMap.this); From 2729955bb199975c53d2e6f97624682e8c69a713 Mon Sep 17 00:00:00 2001 From: Nestor Santana <92853078+efidatansantana@users.noreply.github.com> Date: Fri, 4 Aug 2023 10:18:51 +0200 Subject: [PATCH 2/6] Update CordovaGoogleMaps.java init plugin.cordova = null; to null to prevent enter on assert null of cordova plugin. --- src/android/plugin/google/maps/CordovaGoogleMaps.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/android/plugin/google/maps/CordovaGoogleMaps.java b/src/android/plugin/google/maps/CordovaGoogleMaps.java index 7e965dcee..92e76eacd 100644 --- a/src/android/plugin/google/maps/CordovaGoogleMaps.java +++ b/src/android/plugin/google/maps/CordovaGoogleMaps.java @@ -453,6 +453,8 @@ public void getMap(final JSONArray args, final CallbackContext callbackContext) pluginMap.initialize(cordova, webView); pluginMap.mapCtrl = CordovaGoogleMaps.this; pluginMap.self = pluginMap; + + pluginMap.cordova = null; // avoid failure caused by repreated initialization PluginEntry pluginEntry = new PluginEntry(mapId, pluginMap); pluginManager.addService(pluginEntry); @@ -475,6 +477,8 @@ public void getPanorama(final JSONArray args, final CallbackContext callbackCont pluginStreetView.mapCtrl = CordovaGoogleMaps.this; pluginStreetView.self = pluginStreetView; + pluginStreetView.cordova = null; // avoid failure caused by repreated initialization + PluginEntry pluginEntry = new PluginEntry(mapId, pluginStreetView); pluginManager.addService(pluginEntry); From 0512baaf905bbb85ec5e1183f6c0e15fd11e6583 Mon Sep 17 00:00:00 2001 From: Nestor Santana <92853078+efidatansantana@users.noreply.github.com> Date: Fri, 4 Aug 2023 10:22:02 +0200 Subject: [PATCH 3/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dd66aebfd..3e4d30544 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Cordova GoogleMaps plugin for Android, iOS and Browser v2.7.1 +Android X support and fix white screen | Download | Build test (multiple_maps branch)| |----------|---------------------------| From 19099ba7bf6ef598a521d01ea2d4f23ac4cb2a21 Mon Sep 17 00:00:00 2001 From: Nestor Santana <92853078+efidatansantana@users.noreply.github.com> Date: Fri, 4 Aug 2023 10:22:14 +0200 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e4d30544..fd8c77b58 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Cordova GoogleMaps plugin for Android, iOS and Browser v2.7.1 -Android X support and fix white screen +ยท Android X support and fix white screen | Download | Build test (multiple_maps branch)| |----------|---------------------------| From 3d3a5194b7f1bbe38b922e7fd4443bff09d7600e Mon Sep 17 00:00:00 2001 From: Nestor Santana <92853078+efidatansantana@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:33:07 +0200 Subject: [PATCH 5/6] Update PluginMap.java back to start file --- src/android/plugin/google/maps/PluginMap.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/android/plugin/google/maps/PluginMap.java b/src/android/plugin/google/maps/PluginMap.java index 4b5f18419..a3d379f0e 100644 --- a/src/android/plugin/google/maps/PluginMap.java +++ b/src/android/plugin/google/maps/PluginMap.java @@ -613,7 +613,6 @@ public synchronized void loadPlugin(final JSONArray args, final CallbackContext plugins.put(pluginName, pluginEntry); mapCtrl.pluginManager.addService(pluginEntry); - plugin.cordova = null; // avoid failure caused by repreated initialization plugin.privateInitialize(pluginName, cordova, webView, null); plugin.initialize(cordova, webView); @@ -667,8 +666,6 @@ public void create(final JSONArray args, final CallbackContext callbackContext) pluginMap = PluginMap.this; pluginMap.mapCtrl.pluginManager.addService(pluginEntry); - plugin.cordova = null; // avoid failure caused by repreated initialization - plugin.privateInitialize(className, cordova, webView, null); plugin.initialize(cordova, webView); ((MyPluginInterface)plugin).setPluginMap(PluginMap.this); From 6e7dab6ffcc18053112babb4b8f0050f02f4c144 Mon Sep 17 00:00:00 2001 From: Nestor Santana <92853078+efidatansantana@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:34:13 +0200 Subject: [PATCH 6/6] Update CordovaGoogleMaps.java --- src/android/plugin/google/maps/CordovaGoogleMaps.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/android/plugin/google/maps/CordovaGoogleMaps.java b/src/android/plugin/google/maps/CordovaGoogleMaps.java index 92e76eacd..fbdd470ef 100644 --- a/src/android/plugin/google/maps/CordovaGoogleMaps.java +++ b/src/android/plugin/google/maps/CordovaGoogleMaps.java @@ -476,8 +476,6 @@ public void getPanorama(final JSONArray args, final CallbackContext callbackCont pluginStreetView.initialize(cordova, webView); pluginStreetView.mapCtrl = CordovaGoogleMaps.this; pluginStreetView.self = pluginStreetView; - - pluginStreetView.cordova = null; // avoid failure caused by repreated initialization PluginEntry pluginEntry = new PluginEntry(mapId, pluginStreetView); pluginManager.addService(pluginEntry);