fix: "Reply already submitted" crashes

packages/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt

@@ -19,6 +19,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.annotation.NonNull
+import com.amazonaws.amplify.amplify_core.AtomicResult
 import com.amplifyframework.core.Amplify
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
@@ -51,7 +52,8 @@ class AmplifyAnalyticsPinpointPlugin : FlutterPlugin, ActivityAware, MethodCallH
     }
 
     // Handle methods received via MethodChannel
-    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    override fun onMethodCall(@NonNull call: MethodCall, @NonNull _result: Result) {
+        val result = AtomicResult(_result, call.method)
 
         when (call.method) {
             "addPlugin" ->

packages/amplify_analytics_pinpoint/ios/Classes/SwiftAmplifyAnalyticsPinpointPlugin.swift

@@ -17,6 +17,7 @@ import Flutter
 import UIKit
 import Amplify
 import AmplifyPlugins
+import amplify_core
 
 public class SwiftAmplifyAnalyticsPinpointPlugin: NSObject, FlutterPlugin {
     private let bridge: AnalyticsBridge
@@ -36,6 +37,8 @@ public class SwiftAmplifyAnalyticsPinpointPlugin: NSObject, FlutterPlugin {
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let result = AtomicResult(result, call.method)
+
         innerHandle(method: call.method, callArgs: call.arguments as Any?, result: result)
     }
 

packages/amplify_api/android/src/main/kotlin/com/amazonaws/amplify/amplify_api/AmplifyApiPlugin.kt

@@ -22,6 +22,7 @@ import androidx.annotation.NonNull
 import androidx.annotation.VisibleForTesting
 import com.amazonaws.amplify.amplify_api.auth.FlutterAuthProviders
 import com.amazonaws.amplify.amplify_api.rest_api.FlutterRestApi
+import com.amazonaws.amplify.amplify_core.AtomicResult
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.createSerializedUnrecognizedError
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.handleAddPluginException
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.postExceptionToFlutterChannel
@@ -74,8 +75,9 @@ class AmplifyApiPlugin : FlutterPlugin, MethodCallHandler {
     }
 
     @Suppress("UNCHECKED_CAST")
-    override fun onMethodCall(call: MethodCall, result: Result) {
+    override fun onMethodCall(call: MethodCall, _result: Result) {
         val methodName = call.method
+        val result = AtomicResult(_result, call.method)
 
         if (methodName == "cancel") {
             onCancel(result, (call.arguments as String))

packages/amplify_api/ios/Classes/SwiftAmplifyApiPlugin.swift

@@ -46,6 +46,8 @@ public class SwiftAmplifyApiPlugin: NSObject, FlutterPlugin {
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let result = AtomicResult(result, call.method)
+
         innerHandle(method: call.method, callArgs: call.arguments as Any, result: result)
     }
 

packages/amplify_auth_cognito/android/build.gradle

@@ -67,5 +67,4 @@ dependencies {
     testImplementation 'org.mockito:mockito-inline:3.10.0'
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'org.robolectric:robolectric:4.3.1'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9'
 }

packages/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/AuthCognito.kt

@@ -52,6 +52,7 @@ import com.amazonaws.amplify.amplify_auth_cognito.types.FlutterResendUserAttribu
 import com.amazonaws.amplify.amplify_auth_cognito.types.FlutterSignOutRequest
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.handleAddPluginException
 import com.amazonaws.amplify.amplify_auth_cognito.utils.isRedirectActivityDeclared
+import com.amazonaws.amplify.amplify_core.AtomicResult
 import com.amplifyframework.auth.AuthException
 import com.amplifyframework.auth.AuthProvider
 import com.amplifyframework.auth.AuthSession
@@ -151,7 +152,9 @@ public class AuthCognito : FlutterPlugin, ActivityAware, MethodCallHandler, Plug
     return args as HashMap<String, Any>
   };
 
-  override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+  override fun onMethodCall(@NonNull call: MethodCall, @NonNull _result: Result) {
+
+    val result = AtomicResult(_result, call.method)
 
     if(call.method == "addPlugin"){
       try {

packages/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/device/DeviceHandler.kt

@@ -15,7 +15,7 @@
 package com.amazonaws.amplify.amplify_auth_cognito.device
 
 import com.amazonaws.amplify.amplify_auth_cognito.AuthErrorHandler
-import com.amazonaws.amplify.amplify_auth_cognito.base.AtomicResult
+import com.amazonaws.amplify.amplify_core.AtomicResult
 import com.amazonaws.mobile.client.AWSMobileClient
 import com.amazonaws.mobile.client.Callback
 import com.amazonaws.mobile.client.results.ListDevicesResult

packages/amplify_auth_cognito/ios/Classes/Device/DeviceHandler.swift

@@ -17,6 +17,7 @@ import Foundation
 import Flutter
 import Amplify
 import AmplifyPlugins
+import amplify_core
 
 /// Handles calls to the Devices API.
 struct DeviceHandler {
@@ -43,7 +44,6 @@ struct DeviceHandler {
     func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
         guard DeviceHandler.canHandle(call.method) else { return }
 
-        let result = AtomicResult(result)
         do {
             switch call.method {
             case "rememberDevice":

packages/amplify_auth_cognito/ios/Classes/SwiftAuthCognito.swift

@@ -65,6 +65,8 @@ public class SwiftAuthCognito: NSObject, FlutterPlugin {
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let result = AtomicResult(result, call.method)
+
         if(call.method == "addPlugin"){
             do {
                 try Amplify.add(plugin: AWSCognitoAuthPlugin() )

packages/amplify_core/android/build.gradle

@@ -50,6 +50,7 @@ android {
     testOptions {
         unitTests {
             includeAndroidResources = true
+            returnDefaultValues = true
         }
     }
     buildTypes {
@@ -63,11 +64,14 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.amplifyframework:core:1.28.2'
     implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.10.0'
     testImplementation 'org.mockito:mockito-inline:3.10.0'
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9'
 }
 
 apply plugin: 'org.jlleitschuh.gradle.ktlint'

packages/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/base/AtomicResult.kt → packages/amplify_core/android/src/main/kotlin/com/amazonaws/amplify/amplify_core/AtomicResult.kt

@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amazonaws.amplify.amplify_auth_cognito.base
+package com.amazonaws.amplify.amplify_core
 
 import io.flutter.Log
 import io.flutter.plugin.common.MethodChannel

packages/amplify_auth_cognito/android/src/test/kotlin/com/amazonaws/amplify/amplify_auth_cognito/base/AtomicResultTest.kt → packages/amplify_core/android/src/test/kotlin/com/amazonaws/amplify/amplify_core/AtomicResultTest.kt

@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amazonaws.amplify.amplify_auth_cognito.base
+package com.amazonaws.amplify.amplify_core
 
 import io.flutter.plugin.common.MethodChannel
 import kotlinx.coroutines.Dispatchers

packages/amplify_auth_cognito/android/src/test/kotlin/com/amazonaws/amplify/amplify_auth_cognito/base/CoroutineTestRule.kt → packages/amplify_core/android/src/test/kotlin/com/amazonaws/amplify/amplify_core/CoroutineTestRule.kt

@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amazonaws.amplify.amplify_auth_cognito.base
+package com.amazonaws.amplify.amplify_core
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi

packages/amplify_auth_cognito/ios/Classes/Base/AtomicResult.swift → packages/amplify_core/ios/Classes/Support/AtomicResult.swift

@@ -16,23 +16,30 @@
 import Foundation
 
 /// Thread-safe wrapper for [FlutterResult]. Prevents multiple replies and automically posts results to the main thread.
-func AtomicResult(_ result: @escaping FlutterResult) -> FlutterResult {
-    return atomicResult(result).send
+public func AtomicResult(_ result: @escaping FlutterResult, _ methodName: String) -> FlutterResult {
+    return atomicResult(result, methodName).send
 }
 
 private class atomicResult {
     let result: FlutterResult
 
+    /// The method call which initiated this result.
+    let methodName: String
+
     /// Whether a reply has already been sent.
     var isSent = false
 
-    init(_ result: @escaping FlutterResult) {
+    init(_ result: @escaping FlutterResult, _ methodName: String) {
         self.result = result
+        self.methodName = methodName
     }
 
     func send(_ value: Any?) {
         DispatchQueue.main.async { [self] in
-            guard !isSent else { return }
+            guard !isSent else {
+                NSLog("AtomicResult(%@): Attempted to send value after initial reply", methodName)
+                return
+            }
             result(value)
             isSent = true
         }

packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/AmplifyDataStorePlugin.kt

@@ -19,6 +19,7 @@ import android.os.Handler
 import android.os.Looper
 import androidx.annotation.NonNull
 import androidx.annotation.VisibleForTesting
+import com.amazonaws.amplify.amplify_core.AtomicResult
 import com.amazonaws.amplify.amplify_core.exception.ExceptionMessages
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.createSerializedError
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.createSerializedUnrecognizedError
@@ -99,7 +100,8 @@ class AmplifyDataStorePlugin : FlutterPlugin, MethodCallHandler {
         LOG.info("Initiated DataStore plugin")
     }
 
-    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    override fun onMethodCall(@NonNull call: MethodCall, @NonNull _result: Result) {
+        val result = AtomicResult(_result, call.method)
         var data: Map<String, Any> = HashMap()
         try {
             if (call.arguments != null) {

packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift

@@ -51,6 +51,7 @@ public class SwiftAmplifyDataStorePlugin: NSObject, FlutterPlugin {
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let result = AtomicResult(result, call.method)
         var arguments: [String: Any] = [:]
         do {
             if(call.arguments != nil) {

packages/amplify_flutter/android/src/main/kotlin/com/amazonaws/amplify/Amplify.kt

@@ -21,6 +21,7 @@ import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import androidx.annotation.NonNull
+import com.amazonaws.amplify.amplify_core.AtomicResult
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.createSerializedError
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.postExceptionToFlutterChannel
 import com.amplifyframework.AmplifyException
@@ -67,8 +68,9 @@ class Amplify(
         }
     }
 
-    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
-
+    override fun onMethodCall(@NonNull call: MethodCall, @NonNull _result: Result) {
+        val result = AtomicResult(_result, call.method)
+
         when (call.method) {
             "configure" ->
                 try {

packages/amplify_flutter/ios/Classes/SwiftAmplify.swift

@@ -29,6 +29,8 @@ public class SwiftAmplify: NSObject, FlutterPlugin {
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let result = AtomicResult(result, call.method)
+
         switch call.method {
         case "configure":
             let arguments = call.arguments as! Dictionary<String, AnyObject>

packages/amplify_storage_s3/android/src/main/kotlin/com/amazonaws/amplify/amplify_storage_s3/AmplifyStorageS3Plugin.kt

@@ -20,6 +20,7 @@ import android.content.Context
 import android.src.main.kotlin.com.amazonaws.amplify.amplify_storage_s3.types.TransferProgressStreamHandler
 import android.util.Log
 import androidx.annotation.NonNull
+import com.amazonaws.amplify.amplify_core.AtomicResult
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.handleAddPluginException
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.storage.s3.AWSS3StoragePlugin
@@ -55,7 +56,9 @@ class AmplifyStorageS3Plugin : FlutterPlugin, ActivityAware, MethodCallHandler {
         transferProgressEventChannel.setStreamHandler(transferProgressStreamHandler);
     }
 
-    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    override fun onMethodCall(@NonNull call: MethodCall, @NonNull _result: Result) {
+        val result = AtomicResult(_result, call.method)
+
         if(call.method == "addPlugin"){
             try {
                 Amplify.addPlugin(AWSS3StoragePlugin())

packages/amplify_storage_s3/ios/Classes/SwiftAmplifyStorageS3Plugin.swift

@@ -33,7 +33,7 @@ public class SwiftAmplifyStorageS3Plugin: NSObject, FlutterPlugin {
     }
 
   public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-    print("In handle for method \(call.method)")
+    let result = AtomicResult(result, call.method)
 
     if(call.method == "addPlugin"){
         do {