fix: possible crash

- unstable crash on second received code - unstable crash on timeout
surfstudio · Jul 6, 2023 · be3f7d3 · be3f7d3
1 parent 90a42b3
commit be3f7d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/android/src/main/kotlin/ru/surfstudio/otp_autofill/OTPPlugin.kt b/android/src/main/kotlin/ru/surfstudio/otp_autofill/OTPPlugin.kt
@@ -123,13 +123,15 @@ public class OTPPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Activi
                     // Get SMS message content
                     val message = data.getStringExtra(SmsRetriever.EXTRA_SMS_MESSAGE)
                     lastResult?.success(message)
+                    lastResult = null
                 } else {
                     // Consent denied. User can type OTC manually.
                 }
             credentialPickerRequest -> if (resultCode == Activity.RESULT_OK && data != null) {
                 val phoneNumber =
                     Identity.getSignInClient(context!!).getPhoneNumberFromIntent(data)
                 lastResult?.success(phoneNumber)
+                lastResult = null
             }
         }
         return true
@@ -170,6 +172,7 @@ public class OTPPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Activi
 
                 override fun onFailure() {
                     lastResult?.error("408", "Timeout exception", null)
+                    lastResult = null
                 }
             }
         }
@@ -182,11 +185,15 @@ public class OTPPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Activi
         smsRetrieverBroadcastReceiver = SmsRetrieverReceiver().also {
             it.smsBroadcastReceiverListener = object : SmsRetrieverReceiver.SmsRetrieverBroadcastReceiverListener {
                 override fun onSuccess(sms: String?) {
-                    sms?.let { it -> lastResult?.success(it) }
+                    sms?.let { it ->
+                        lastResult?.success(it)
+                        lastResult = null
+                    }
                 }
 
                 override fun onFailure() {
                     lastResult?.error("408", "Timeout exception", null)
+                    lastResult = null
                 }
             }
         }

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }