Ensures [CLLocationManager locationServicesEnabled] is called on back…

…ground thread (#1399) * Call locationServiceEnabled on separate thread * Update version number * Remove redundant empty lines
Baseflow · Dec 27, 2023 · 6fb962c · 6fb962c
1 parent b311084
commit 6fb962c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/geolocator_apple/CHANGELOG.md b/geolocator_apple/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.3.3
+
+* Ensures the `[CLLocationManager locationServicesEnabled]` message is called
+on a background thread when listening for service updates.
+
 ## 2.3.2
 
 * Fixes build error and warnings regarding unused variables and unavailable APIs on macOS.

diff --git a/geolocator_apple/ios/Classes/Handlers/LocationServiceStreamHandler.m b/geolocator_apple/ios/Classes/Handlers/LocationServiceStreamHandler.m
@@ -34,11 +34,16 @@ - (FlutterError * _Nullable)onListenWithArguments:(id _Nullable)arguments eventS
 }
 
 - (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status{
-  if ([CLLocationManager locationServicesEnabled]) {
-    _eventSink([NSNumber numberWithInt:(ServiceStatus)enabled]);
-  } else {
-    _eventSink([NSNumber numberWithInt:(ServiceStatus)disabled]);
-  }
+  dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    BOOL isEnabled = [CLLocationManager locationServicesEnabled];
+    dispatch_async(dispatch_get_main_queue(), ^(void) {
+        if (isEnabled) {
+            self->_eventSink([NSNumber numberWithInt:(ServiceStatus)enabled]);
+        } else {
+            self->_eventSink([NSNumber numberWithInt:(ServiceStatus)disabled]);
+        }
+    });
+  });
 }
 
 @end
diff --git a/geolocator_apple/pubspec.yaml b/geolocator_apple/pubspec.yaml
@@ -2,7 +2,7 @@ name: geolocator_apple
 description: Geolocation Apple plugin for Flutter. This plugin provides the Apple implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_apple
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 2.3.2
+version: 2.3.3
 
 environment:
   sdk: ">=2.15.0 <4.0.0"