[#1240] Fix crash under Windows (#1358)

Baseflow · Oct 25, 2023 · 322eaf6 · 322eaf6
1 parent 1c4be61
commit 322eaf6
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 12 deletions.
diff --git a/geolocator/pubspec.yaml b/geolocator/pubspec.yaml
@@ -30,7 +30,7 @@ dependencies:
   geolocator_android: ^4.3.0
   geolocator_apple: ^2.3.0
   geolocator_web: ^2.2.0
-  geolocator_windows: ^0.2.1
+  geolocator_windows: ^0.2.2
 
 dev_dependencies:
   flutter_test:

diff --git a/geolocator_windows/CHANGELOG.md b/geolocator_windows/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.2
+
+* Fixes crash under Windows when getCurrentPosition method is called. (#1240)
+
 ## 0.2.1
 
 * Exposes altitude accuracy to the `Position` class.
@@ -24,4 +28,4 @@ if "Let apps access your location" toggle option is switched ON from OFF.
 
 ## 0.1.0
 
-* Adds an initial implementation of Windows support for the geolocator plugin.
+* Adds an initial implementation of Windows support for the geolocator plugin.
diff --git a/geolocator_windows/pubspec.yaml b/geolocator_windows/pubspec.yaml
@@ -2,7 +2,7 @@ name: geolocator_windows
 description: Geolocation Windows plugin for Flutter. This plugin provides the Windows implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocators
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 0.2.1
+version: 0.2.2
 
 environment:
   sdk: ">=2.15.0 <4.0.0"

diff --git a/geolocator_windows/windows/geolocator_enums.h b/geolocator_windows/windows/geolocator_enums.h
@@ -1,7 +1,9 @@
 namespace geolocator_plugin {
 
 enum ErrorCode {
-    PermissionDefinitionsNotFound
+    PermissionDefinitionsNotFound,
+    OperationCanceled,
+    UnknownError
 };
 
 enum LocationPermission {
@@ -31,4 +33,4 @@ enum ServiceStatus {
   Enabled
 };
 
-}  // namespace geolocator_plugin
+}  // namespace geolocator_plugin
diff --git a/geolocator_windows/windows/geolocator_plugin.cpp b/geolocator_windows/windows/geolocator_plugin.cpp
@@ -25,8 +25,12 @@ std::string ErrorCodeToString(ErrorCode errorCode) {
   switch (errorCode) {
     case ErrorCode::PermissionDefinitionsNotFound:
       return "PERMISSION_DEFINITIONS_NOT_FOUND";
+    case ErrorCode::OperationCanceled:
+      return "OPERATION_CANCELED";
+    case ErrorCode::UnknownError:
+      return "UNKNOWN_ERROR";
     default:
-      return "";
+      throw std::logic_error("unexcepted value" + static_cast<int>(errorCode));
   }
 }
 
@@ -146,8 +150,13 @@ void GeolocatorPlugin::OnCheckPermission(std::unique_ptr<MethodResult<>> result)
   RequestAccessAsync(std::move(result));
 }
 
+bool isLocationStatusValid (const PositionStatus& status) {
+    return status != PositionStatus::Disabled 
+        && status != PositionStatus::NotAvailable;
+}
+
 void GeolocatorPlugin::OnIsLocationServiceEnabled(std::unique_ptr<MethodResult<>> result) {
-  result->Success(EncodableValue(geolocator.LocationStatus() != PositionStatus::NotAvailable));
+    result->Success(EncodableValue(isLocationStatusValid(geolocator.LocationStatus())));
 }
 
 void GeolocatorPlugin::OnRequestPermission(std::unique_ptr<MethodResult<>> result) {
@@ -156,8 +165,18 @@ void GeolocatorPlugin::OnRequestPermission(std::unique_ptr<MethodResult<>> resul
 
 winrt::fire_and_forget GeolocatorPlugin::OnGetLastKnownPosition(const MethodCall<>& method_call,
   std::unique_ptr<MethodResult<>> result) {
-  auto location = co_await geolocator.GetGeopositionAsync(std::chrono::hours(1), std::chrono::milliseconds::zero());
-  result->Success(LocationToEncodableMap(location));
+    try {
+        auto location = co_await geolocator.GetGeopositionAsync(std::chrono::hours(1), std::chrono::milliseconds::zero());
+        result->Success(LocationToEncodableMap(location));
+    }
+    catch (hresult_canceled const& error) {
+        result->Error(ErrorCodeToString(ErrorCode::OperationCanceled), 
+            to_string(error.message()));
+    }
+    catch (hresult_error const& error) {
+        result->Error(ErrorCodeToString(ErrorCode::UnknownError), 
+            to_string(error.message()));
+    }
 }
 
 void GeolocatorPlugin::GetLocationAccuracy(std::unique_ptr<MethodResult<>> result) {
@@ -169,9 +188,18 @@ void GeolocatorPlugin::GetLocationAccuracy(std::unique_ptr<MethodResult<>> resul
 
 winrt::fire_and_forget GeolocatorPlugin::OnGetCurrentPosition(const MethodCall<>& method_call,
   std::unique_ptr<MethodResult<>> result) {
-
-  auto location = co_await geolocator.GetGeopositionAsync();
-  result->Success(LocationToEncodableMap(location));
+    try {
+        auto location = co_await geolocator.GetGeopositionAsync();
+        result->Success(LocationToEncodableMap(location));
+    }
+    catch (hresult_canceled const& error) {
+        result->Error(ErrorCodeToString(ErrorCode::OperationCanceled), 
+            to_string(error.message()));
+    }
+    catch (hresult_error const& error) {
+        result->Error(ErrorCodeToString(ErrorCode::UnknownError), 
+            to_string(error.message()));
+    }
 }
 
 std::unique_ptr<StreamHandlerError<EncodableValue>> GeolocatorPlugin::OnListen(