Make sure the GeolocationManager instance is shared (#1466)

Author: mvanbeusekom

geolocator_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.5.4
+
+* Fixes a bug where the `getPositionStream` was not informed of the location service resolution result. This resulted in a stream that was kept open indefinitely.
+
 ## 4.5.3+1
 
 * Reverts `androidx.core:core` to version `1.9.0`.

geolocator_android/android/src/main/java/com/baseflow/geolocator/GeolocatorLocationService.java

@@ -50,7 +50,6 @@ public class GeolocatorLocationService extends Service {
   public void onCreate() {
     super.onCreate();
     Log.d(TAG, "Creating service.");
-    geolocationManager = new GeolocationManager();
   }
 
   @Override
@@ -177,6 +176,10 @@ public void setActivity(@Nullable Activity activity) {
     this.activity = activity;
   }
 
+  public void setGeolocationManager(@Nullable GeolocationManager geolocationManager) {
+      this.geolocationManager = geolocationManager;
+  }
+
   private void releaseWakeLocks() {
     if (wakeLock != null && wakeLock.isHeld()) {
       wakeLock.release();

geolocator_android/android/src/main/java/com/baseflow/geolocator/GeolocatorPlugin.java

@@ -68,7 +68,7 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
             this.permissionManager, this.geolocationManager, this.locationAccuracyManager);
     methodCallHandler.startListening(
         flutterPluginBinding.getApplicationContext(), flutterPluginBinding.getBinaryMessenger());
-    streamHandler = new StreamHandlerImpl(this.permissionManager);
+    streamHandler = new StreamHandlerImpl(this.permissionManager, this.geolocationManager);
     streamHandler.startListening(
         flutterPluginBinding.getApplicationContext(), flutterPluginBinding.getBinaryMessenger());
 
@@ -161,6 +161,7 @@ private void unbindForegroundService(Context context) {
   private void initialize(GeolocatorLocationService service) {
     Log.d(TAG, "Initializing Geolocator services");
     foregroundLocationService = service;
+    foregroundLocationService.setGeolocationManager(geolocationManager);
     foregroundLocationService.flutterEngineConnected();
 
     if (streamHandler != null) {

geolocator_android/android/src/main/java/com/baseflow/geolocator/StreamHandlerImpl.java

@@ -33,9 +33,9 @@ class StreamHandlerImpl implements EventChannel.StreamHandler {
   @Nullable private GeolocationManager geolocationManager;
   @Nullable private LocationClient locationClient;
 
-  public StreamHandlerImpl(PermissionManager permissionManager) {
+  public StreamHandlerImpl(PermissionManager permissionManager, GeolocationManager geolocationManager) {
     this.permissionManager = permissionManager;
-    geolocationManager = new GeolocationManager();
+    this.geolocationManager = geolocationManager;
   }
 
   public void setForegroundLocationService(

geolocator_android/pubspec.yaml

@@ -2,7 +2,7 @@ name: geolocator_android
 description: Geolocation plugin for Flutter. This plugin provides the Android implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_android
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 4.5.3+1
+version: 4.5.4
 
 environment:
   sdk: ">=2.15.0 <4.0.0"