Fix disposal crash (#617)

* Prevent resource disposal from throwing exceptions

* Fix the order of map widget disposal

* Add changelog entry

* Synchronously dispose map widget and its dependencies

* Fix iOS signing

* Update fastlane version

Author: evil159

.circleci/config.yml

@@ -121,6 +121,7 @@ jobs:
 
             popd # to repo root
 
+            bundle install
             bundle exec fastlane build_examples_tests
       - persist_to_workspace:
           root: << parameters.workspace-path >>

.fastlane/Fastfile

@@ -14,15 +14,15 @@ platform :ios do
       team_id: "GJZR2MEM28", # Developer Portal Team ID,
       profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.maps.FlutterMapsExample"],
       targets: ["Runner"],
-      code_sign_identity: "Apple Development: Machiney McMachineface",
+      code_sign_identity: "Apple Development: Created via API",
     )
     update_code_signing_settings(
       use_automatic_signing: false,
       path: "example/ios/Runner.xcodeproj",
       team_id: "GJZR2MEM28", # Developer Portal Team ID,
       profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.maps.FlutterRunnerTests"],
       targets: ["RunnerTests"],
-      code_sign_identity: "Apple Development: Machiney McMachineface",
+      code_sign_identity: "Apple Development: Created via API",
     )
     # build tests archive in the `output_directory` to launch on firebase
     run_tests(

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Support local assets for 3D puck and `ModelLayer`. To use a local assets, please specify it with `asset://` scheme in the uri.
 * Fix map view crashing upon host activity destruction when using a cached Flutter engine.
+* Fix a rare crash happening when map widget is being disposed.
 
 ### 2.1.0
 

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem "fastlane", "~> 2.221.1"
 
 plugins_path = File.join(File.dirname(__FILE__), '.fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)

example/ios/Runner.xcodeproj/project.pbxproj

@@ -422,7 +422,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Apple Development: Machiney McMachineface";
+				CODE_SIGN_IDENTITY = "Apple Development: Created via API";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = GJZR2MEM28;
@@ -456,7 +456,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Apple Development: Machiney McMachineface";
+				CODE_SIGN_IDENTITY = "Apple Development: Created via API";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = GJZR2MEM28;
@@ -489,7 +489,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "Apple Development: Machiney McMachineface";
+				CODE_SIGN_IDENTITY = "Apple Development: Created via API";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = GJZR2MEM28;
@@ -566,7 +566,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development: Machiney McMachineface";
+				CODE_SIGN_IDENTITY = "Apple Development: Created via API";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = GJZR2MEM28;
@@ -697,7 +697,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development: Machiney McMachineface";
+				CODE_SIGN_IDENTITY = "Apple Development: Created via API";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = GJZR2MEM28;
@@ -723,7 +723,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development: Machiney McMachineface";
+				CODE_SIGN_IDENTITY = "Apple Development: Created via API";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = GJZR2MEM28;

lib/src/map_widget.dart

@@ -168,8 +168,6 @@ class MapWidget extends StatefulWidget {
 }
 
 class _MapWidgetState extends State<MapWidget> {
-  final Completer<MapboxMap> _controller = Completer<MapboxMap>();
-
   late final _MapboxMapsPlatform _mapboxMapsPlatform =
       _MapboxMapsPlatform(binaryMessenger: _binaryMessenger);
   final int _suffix = _suffixesRegistry.getSuffix();
@@ -204,14 +202,12 @@ class _MapWidgetState extends State<MapWidget> {
   }
 
   @override
-  void dispose() async {
-    super.dispose();
-    if (_controller.isCompleted) {
-      final controller = await _controller.future;
-      controller.dispose();
-    }
+  void dispose() {
+    mapboxMap?.dispose();
     _suffixesRegistry.releaseSuffix(_suffix);
     _events.dispose();
+
+    super.dispose();
   }
 
   @override
@@ -247,7 +243,6 @@ class _MapWidgetState extends State<MapWidget> {
       onMapLongTapListener: widget.onLongTapListener,
       onMapScrollListener: widget.onScrollListener,
     );
-    _controller.complete(controller);
     if (widget.onMapCreated != null) {
       widget.onMapCreated!(controller);
     }

lib/src/mapbox_maps_platform.dart

@@ -99,7 +99,11 @@ class _MapboxMapsPlatform {
   }
 
   void dispose() async {
-    await _channel.invokeMethod('platform#releaseMethodChannels');
+    try {
+      await _channel.invokeMethod('platform#releaseMethodChannels');
+    } catch (e) {
+      print("Error releasing method channels: $e");
+    }
 
     _channel.setMethodCallHandler(null);
   }