Fix: the BackgroundIsolateBinaryMessenger initialization

Maksimka101 · Aug 24, 2023 · 5511ef6 · 5511ef6
1 parent c213c16
commit 5511ef6
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.5
+
+- Fix the `BackgroundIsolateBinaryMessenger` initialization.
+
 ## 0.5.4
 - Upgrade to the flutter 3.13.0.
 

diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -171,10 +171,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -185,6 +187,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -272,7 +275,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -350,7 +353,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -399,7 +402,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -43,5 +43,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -73,7 +73,7 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Future<void> _createAssetsIsolate() async {
-    final isolate = await Combine().spawn<String>(
+    final isolate = await Combine().spawn(
       (context) {
         final messenger = context.messenger;
 
@@ -170,7 +170,7 @@ class _MyHomePageState extends State<MyHomePage> {
                 title: const Text("Error from calculate fibonacci worker"),
                 subtitle: Text(_calculateFibonacciError.toString()),
               ),
-          ]
+          ],
         ],
       ),
     );

diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj
@@ -203,7 +203,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -47,7 +47,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.5.4"
+    version: "0.5.5"
   cupertino_icons:
     dependency: "direct main"
     description:

diff --git a/lib/src/bindings/isolate_bindings/isolate_binding.dart b/lib/src/bindings/isolate_bindings/isolate_binding.dart
@@ -9,7 +9,6 @@ import 'package:flutter/services.dart';
 
 part 'absent_scheduler_binding.dart';
 part 'mock_binary_messenger_service_binding.dart';
-part 'mock_restoration_manager.dart';
 
 class IsolateBinding extends BindingBase
     with
@@ -20,5 +19,4 @@ class IsolateBinding extends BindingBase
   ui.PlatformDispatcher get platformDispatcher {
     throw UnimplementedError();
   }
-
 }
diff --git a/lib/src/bindings/isolate_bindings/mock_binary_messenger_service_binding.dart b/lib/src/bindings/isolate_bindings/mock_binary_messenger_service_binding.dart
@@ -9,6 +9,8 @@ mixin _MockBinaryMessengerServiceBinding on ServicesBinding {
 
   @override
   RestorationManager createRestorationManager() {
-    return _MockRestorationManager();
+    throw IsolateBindingInitializationFinished();
   }
 }
+
+class IsolateBindingInitializationFinished {}
diff --git a/lib/src/bindings/isolate_bindings/mock_restoration_manager.dart b/lib/src/bindings/isolate_bindings/mock_restoration_manager.dart
diff --git a/lib/src/isolate_factory/native_isolate_factory.dart b/lib/src/isolate_factory/native_isolate_factory.dart
@@ -64,20 +64,20 @@ class NativeIsolateFactory extends IsolateFactory {
   }
 
   static void _runInIsolate<T>(_IsolateSetup<T> setup) {
-    final receivePort = ReceivePort();
-    final isolateMessenger = NativeInternalIsolateMessenger(
-      setup.sendPort,
-      receivePort.asBroadcastStream().cast<Object?>(),
-    );
     final isolateToken = setup.isolateToken;
     if (isolateToken != null) {
       _lastUsedIsolateToken = isolateToken;
       BackgroundIsolateBinaryMessenger.ensureInitialized(isolateToken);
     }
+    final receivePort = ReceivePort();
+    final isolateMessenger = NativeInternalIsolateMessenger(
+      setup.sendPort,
+      receivePort.asBroadcastStream().cast<Object?>(),
+    );
     IsolatedBinaryMessengerMiddleware(isolateMessenger).initialize();
     try {
       IsolateBinding();
-    } catch (_) {} // Isolate binding should throw exception to skip unnecessary initialization.
+    } on IsolateBindingInitializationFinished catch (_) {} // Isolate binding will throw an exception to skip unnecessary initialization.
 
     final isolateContext = IsolateContext(
       argument: setup.argument,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: combine
 description: A Flutter package which allows you to work with
   MethodChannels in Isolate and provides simplified Isolate and Thread Pool API.
-version: 0.5.4
+version: 0.5.5
 homepage: https://github.com/Maksimka101/combine
 repository: https://github.com/Maksimka101/combine