From c70c1792f6ebb2e34fc4c7331c08b0de7e9129b4 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 2 Oct 2020 15:48:26 +0530
Subject: all: refactor ActivityResultContracts usages to adhere to API
 requirements

The newest versions of AndroidX Activity and Fragments correctly enforce the
requirement for all contracts to be registered at class init or before
the lifecycle has reached `Lifecycle.State.STARTED`. To comply with these requirements,
move all instances of `registerForActivityResult` being called at arbitrary points
in the code to be done at class init.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit cf03c554785ee822be3408edcfb81fa4cf03d0e5)
---
 .../autofill/oreo/ui/AutofillDecryptActivity.kt    | 24 ++++++++++++----------
 .../autofill/oreo/ui/AutofillFilterActivity.kt     | 14 +++++++------
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/autofill')

diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillDecryptActivity.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillDecryptActivity.kt
index 9bab9e6f..a5bdcfe0 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillDecryptActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillDecryptActivity.kt
@@ -81,6 +81,18 @@ class AutofillDecryptActivity : AppCompatActivity(), CoroutineScope {
         }
     }
 
+    private val decryptInteractionRequiredAction = registerForActivityResult(StartIntentSenderForResult()) { result ->
+        if (continueAfterUserInteraction != null) {
+            val data = result.data
+            if (result.resultCode == RESULT_OK && data != null) {
+                continueAfterUserInteraction?.resume(data)
+            } else {
+                continueAfterUserInteraction?.resumeWithException(Exception("OpenPgpApi ACTION_DECRYPT_VERIFY failed to continue after user interaction"))
+            }
+            continueAfterUserInteraction = null
+        }
+    }
+
     private var continueAfterUserInteraction: Continuation<Intent>? = null
     private lateinit var directoryStructure: DirectoryStructure
 
@@ -198,17 +210,7 @@ class AutofillDecryptActivity : AppCompatActivity(), CoroutineScope {
                             val intentToResume = withContext(Dispatchers.Main) {
                                 suspendCoroutine<Intent> { cont ->
                                     continueAfterUserInteraction = cont
-                                    registerForActivityResult(StartIntentSenderForResult()) { result ->
-                                        if (continueAfterUserInteraction != null) {
-                                            val data = result.data
-                                            if (result.resultCode == RESULT_OK && data != null) {
-                                                continueAfterUserInteraction?.resume(data)
-                                            } else {
-                                                continueAfterUserInteraction?.resumeWithException(Exception("OpenPgpApi ACTION_DECRYPT_VERIFY failed to continue after user interaction"))
-                                            }
-                                            continueAfterUserInteraction = null
-                                        }
-                                    }.launch(IntentSenderRequest.Builder(pendingIntent.intentSender).build())
+                                    decryptInteractionRequiredAction.launch(IntentSenderRequest.Builder(pendingIntent.intentSender).build())
                                 }
                             }
                             decryptCredential(file, intentToResume)
diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillFilterActivity.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillFilterActivity.kt
index 95e49fdd..f22c6596 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillFilterActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillFilterActivity.kt
@@ -79,6 +79,13 @@ class AutofillFilterView : AppCompatActivity() {
         ViewModelProvider.AndroidViewModelFactory(application)
     }
 
+    private val decryptAction = registerForActivityResult(StartActivityForResult()) { result ->
+        if (result.resultCode == RESULT_OK) {
+            setResult(RESULT_OK, result.data)
+        }
+        finish()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
@@ -197,12 +204,7 @@ class AutofillFilterView : AppCompatActivity() {
             item.file
         )
         // intent?.extras? is checked to be non-null in onCreate
-        registerForActivityResult(StartActivityForResult()) { result ->
-            if (result.resultCode == RESULT_OK) {
-                setResult(RESULT_OK, result.data)
-            }
-            finish()
-        }.launch(AutofillDecryptActivity.makeDecryptFileIntent(
+        decryptAction.launch(AutofillDecryptActivity.makeDecryptFileIntent(
             item.file,
             intent!!.extras!!,
             this
-- 
cgit v1.2.3