fix(ios): Executed fetch token and more actions on main thread

BreX900 · Sep 14, 2023 · b41d829 · b41d829
1 parent 4f41725
commit b41d829
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 47 deletions.
diff --git a/one_for_all_generator/lib/src/generators/swift_api_builder.dart b/one_for_all_generator/lib/src/generators/swift_api_builder.dart
@@ -391,11 +391,13 @@ channel = FlutterMethodChannel(
 channel.invokeMethod("${handler.channelName(e)}", arguments: [$parameters])''',
             MethodApiType.async => '''
 return try await withCheckedThrowingContinuation { continuation in
-    channel.invokeMethod("${handler.channelName(e)}", arguments: [$parameters]) { result in
-        if let result = result as? FlutterError {
-            continuation.resume(throwing: PlatformError(result.code, result.message, result.details))
-        } else {
-            continuation.resume(returning: ${returnType is VoidType ? '()' : codecs.encodeDeserialization(returnType, 'result')})
+    DispatchQueue.main.async {
+        self.channel.invokeMethod("${handler.channelName(e)}", arguments: [$parameters]) { result in
+            if let result = result as? FlutterError {
+                continuation.resume(throwing: PlatformError(result.code, result.message, result.details))
+            } else {
+                continuation.resume(returning: ${returnType is VoidType ? '()' : codecs.encodeDeserialization(returnType, 'result')})
+            }
         }
     }
 }''',

diff --git a/stripe_terminal/CHANGELOG.md b/stripe_terminal/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 2.1.2
+- fix(ios): Executed fetch token and more actions on main thread
+
 ## 2.1.0
 - docs: Documented readers (methods, classes) and payment intents (methods)
 - feat: added `Readers.batteryStatus` field

diff --git a/stripe_terminal/android/src/main/kotlin/mek/stripeterminal/api/StripeTerminalApi.kt b/stripe_terminal/android/src/main/kotlin/mek/stripeterminal/api/StripeTerminalApi.kt
@@ -856,23 +856,23 @@ enum class PaymentStatusApi {
 
 data class ReaderApi(
     val locationStatus: LocationStatusApi?,
-    val batteryLevel: Double,
     val deviceType: DeviceTypeApi?,
     val simulated: Boolean,
-    val availableUpdate: Boolean,
     val locationId: String?,
     val serialNumber: String,
+    val availableUpdate: Boolean,
+    val batteryLevel: Double,
     val label: String?,
 ) {
     fun serialize(): List<Any?> {
         return listOf(
             locationStatus?.ordinal,
-            batteryLevel,
             deviceType?.ordinal,
             simulated,
-            availableUpdate,
             locationId,
             serialNumber,
+            availableUpdate,
+            batteryLevel,
             label,
         )
     }

diff --git a/stripe_terminal/example/ios/Runner.xcodeproj/project.pbxproj b/stripe_terminal/example/ios/Runner.xcodeproj/project.pbxproj
@@ -214,7 +214,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {

diff --git a/stripe_terminal/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/stripe_terminal/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/stripe_terminal/example/pubspec.lock b/stripe_terminal/example/pubspec.lock
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   crypto:
     dependency: transitive
     description:
@@ -86,14 +86,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   json_annotation:
     dependency: transitive
     description:
@@ -122,10 +114,10 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   mek_data_class:
     dependency: transitive
     description:
@@ -148,7 +140,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
+    version: "2.1.2"
   meta:
     dependency: transitive
     description:
@@ -314,6 +306,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.10.0"
diff --git a/stripe_terminal/ios/Classes/Api/StripeTerminalApi.swift b/stripe_terminal/ios/Classes/Api/StripeTerminalApi.swift
@@ -480,11 +480,13 @@ class StripeTerminalHandlersApi {
 
     func requestConnectionToken() async throws -> String {
         return try await withCheckedThrowingContinuation { continuation in
-            channel.invokeMethod("_onRequestConnectionToken", arguments: []) { result in
-                if let result = result as? FlutterError {
-                    continuation.resume(throwing: PlatformError(result.code, result.message, result.details))
-                } else {
-                    continuation.resume(returning: result as! String)
+            DispatchQueue.main.async {
+                self.channel.invokeMethod("_onRequestConnectionToken", arguments: []) { result in
+                    if let result = result as? FlutterError {
+                        continuation.resume(throwing: PlatformError(result.code, result.message, result.details))
+                    } else {
+                        continuation.resume(returning: result as! String)
+                    }
                 }
             }
         }
@@ -924,23 +926,23 @@ enum PaymentStatusApi: Int {
 
 struct ReaderApi {
     let locationStatus: LocationStatusApi?
-    let batteryLevel: Double
     let deviceType: DeviceTypeApi?
     let simulated: Bool
-    let availableUpdate: Bool
     let locationId: String?
     let serialNumber: String
+    let availableUpdate: Bool
+    let batteryLevel: Double
     let label: String?
 
     func serialize() -> [Any?] {
         return [
             locationStatus?.rawValue,
-            batteryLevel,
             deviceType?.rawValue,
             simulated,
-            availableUpdate,
             locationId,
             serialNumber,
+            availableUpdate,
+            batteryLevel,
             label,
         ]
     }

diff --git a/stripe_terminal/ios/Classes/Api/ToApiExtensions.swift b/stripe_terminal/ios/Classes/Api/ToApiExtensions.swift
@@ -17,12 +17,12 @@ extension Reader {
     func toApi() -> ReaderApi {
         return ReaderApi(
             locationStatus: locationStatus.toApi(),
-            batteryLevel: batteryLevel?.doubleValue ?? -1.0,
             deviceType: deviceType.toApi(),
             simulated: simulated,
-            availableUpdate: availableUpdate != nil,
             locationId: locationId,
             serialNumber: serialNumber,
+            availableUpdate: availableUpdate != nil,
+            batteryLevel: batteryLevel?.doubleValue ?? -1.0,
             label: label
         )
     }

diff --git a/stripe_terminal/ios/Classes/Plugin/TerminalDelegatePlugin.swift b/stripe_terminal/ios/Classes/Plugin/TerminalDelegatePlugin.swift
@@ -9,18 +9,24 @@ class TerminalDelegatePlugin: NSObject, ConnectionTokenProvider, TerminalDelegat
     }
 
     public func fetchConnectionToken() async throws -> String {
-        return try await handlers.requestConnectionToken()
+        return try await self.handlers.requestConnectionToken()
     }
 
     public func terminal(_: Terminal, didReportUnexpectedReaderDisconnect reader: Reader) {
-        handlers.unexpectedReaderDisconnect(reader: reader.toApi())
+        DispatchQueue.main.async {
+            self.handlers.unexpectedReaderDisconnect(reader: reader.toApi())
+        }
     }
 
     public func terminal(_: Terminal, didChangePaymentStatus status: PaymentStatus) {
-        handlers.paymentStatusChange(paymentStatus: status.toApi())
+        DispatchQueue.main.async {
+            self.handlers.paymentStatusChange(paymentStatus: status.toApi())
+        }
     }
 
     public func terminal(_: Terminal, didChangeConnectionStatus status: ConnectionStatus) {
-        handlers.connectionStatusChange(connectionStatus: status.toApi())
+        DispatchQueue.main.async {
+            self.handlers.connectionStatusChange(connectionStatus: status.toApi())
+        }
     }
 }
diff --git a/stripe_terminal/lib/src/platform/stripe_terminal_platform.api.dart b/stripe_terminal/lib/src/platform/stripe_terminal_platform.api.dart
diff --git a/stripe_terminal/pubspec.yaml b/stripe_terminal/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mek_stripe_terminal
 description: A StripeTerminal plugin to discover readers, connect to them and process payments.
-version: 2.1.0
+version: 2.1.2
 repository: https://github.com/BreX900/mek-packages/tree/main/stripe_terminal
 topics:
   - stripe-terminal