From e5bb69ea5f12a35bef4d1494cb31328df2a5a2e7 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Tue, 23 Nov 2021 18:28:01 +0100 Subject: [PATCH] Fix startActivityResult for Autofill --- .../activities/AutofillLauncherActivity.kt | 20 +++----- .../keepass/activities/EntryEditActivity.kt | 6 ++- .../activities/FileDatabaseSelectActivity.kt | 21 +++++--- .../keepass/activities/GroupActivity.kt | 22 +++++--- .../keepass/activities/PasswordActivity.kt | 28 +++++++---- .../keepass/autofill/AutofillHelper.kt | 50 +++++++++++-------- 6 files changed, 88 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt index aedef5a1f..db7d6eb1f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt @@ -26,6 +26,7 @@ import android.content.Intent import android.os.Build import android.view.inputmethod.InlineSuggestionsRequest import android.widget.Toast +import androidx.activity.result.ActivityResultLauncher import androidx.annotation.RequiresApi import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper @@ -39,11 +40,15 @@ import com.kunzisoft.keepass.database.search.SearchHelper import com.kunzisoft.keepass.model.RegisterInfo import com.kunzisoft.keepass.model.SearchInfo import com.kunzisoft.keepass.settings.PreferencesUtil -import com.kunzisoft.keepass.utils.LOCK_ACTION @RequiresApi(api = Build.VERSION_CODES.O) class AutofillLauncherActivity : DatabaseModeActivity() { + private var mAutofillActivityResultLauncher: ActivityResultLauncher? = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + AutofillHelper.buildActivityResultLauncher(this, true) + else null + override fun applyCustomStyle(): Boolean { return false } @@ -118,6 +123,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() { // Show the database UI to select the entry GroupActivity.launchForAutofillResult(this, openedDatabase, + mAutofillActivityResultLauncher, autofillComponent, searchInfo, false) @@ -125,6 +131,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() { { // If database not open FileDatabaseSelectActivity.launchForAutofillResult(this, + mAutofillActivityResultLauncher, autofillComponent, searchInfo) } @@ -185,17 +192,6 @@ class AutofillLauncherActivity : DatabaseModeActivity() { Toast.makeText(this.applicationContext, R.string.autofill_read_only_save, Toast.LENGTH_LONG).show() } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data) - - if (PreferencesUtil.isAutofillCloseDatabaseEnable(this)) { - // Close the database - sendBroadcast(Intent(LOCK_ACTION)) - } - - super.onActivityResult(requestCode, resultCode, data) - } - companion object { private const val KEY_MANUAL_SELECTION = "KEY_MANUAL_SELECTION" diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index d3bde73ca..8726d61aa 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -33,9 +33,11 @@ import android.view.Menu import android.view.MenuItem import android.view.View import android.widget.* +import androidx.activity.result.ActivityResultLauncher import androidx.activity.viewModels import androidx.annotation.RequiresApi import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.view.isVisible import androidx.core.widget.NestedScrollView @@ -802,8 +804,9 @@ class EntryEditActivity : DatabaseLockActivity(), * Launch EntryEditActivity to add a new entry in autofill selection */ @RequiresApi(api = Build.VERSION_CODES.O) - fun launchForAutofillResult(activity: Activity, + fun launchForAutofillResult(activity: AppCompatActivity, database: Database, + activityResultLauncher: ActivityResultLauncher?, autofillComponent: AutofillComponent, groupId: NodeId<*>, searchInfo: SearchInfo? = null) { @@ -814,6 +817,7 @@ class EntryEditActivity : DatabaseLockActivity(), AutofillHelper.startActivityForAutofillResult( activity, intent, + activityResultLauncher, autofillComponent, searchInfo ) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt index 5c0d740c1..f853485a6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -31,8 +31,10 @@ import android.util.Log import android.view.Menu import android.view.MenuItem import android.view.View +import androidx.activity.result.ActivityResultLauncher import androidx.activity.viewModels import androidx.annotation.RequiresApi +import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.recyclerview.widget.LinearLayoutManager @@ -85,6 +87,11 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), private var mExternalFileHelper: ExternalFileHelper? = null + private var mAutofillActivityResultLauncher: ActivityResultLauncher? = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + AutofillHelper.buildActivityResultLauncher(this) + else null + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -274,7 +281,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), fileNoFoundAction(exception) }, { onCancelSpecialMode() }, - { onLaunchActivitySpecialMode() }) + { onLaunchActivitySpecialMode() }, + mAutofillActivityResultLauncher) } private fun launchGroupActivityIfLoaded(database: Database) { @@ -283,7 +291,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), database, { onValidateSpecialMode() }, { onCancelSpecialMode() }, - { onLaunchActivitySpecialMode() }) + { onLaunchActivitySpecialMode() }, + mAutofillActivityResultLauncher) } } @@ -362,10 +371,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data) - } - mExternalFileHelper?.onOpenDocumentResult(requestCode, resultCode, data) { uri -> if (uri != null) { launchPasswordActivityWithPath(uri) @@ -499,11 +504,13 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), */ @RequiresApi(api = Build.VERSION_CODES.O) - fun launchForAutofillResult(activity: Activity, + fun launchForAutofillResult(activity: AppCompatActivity, + activityResultLauncher: ActivityResultLauncher?, autofillComponent: AutofillComponent, searchInfo: SearchInfo? = null) { AutofillHelper.startActivityForAutofillResult(activity, Intent(activity, FileDatabaseSelectActivity::class.java), + activityResultLauncher, autofillComponent, searchInfo) } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index 8c9bc7ee8..661ed1122 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -33,8 +33,10 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.* +import androidx.activity.result.ActivityResultLauncher import androidx.activity.viewModels import androidx.annotation.RequiresApi +import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ActionMode import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.Toolbar @@ -111,6 +113,11 @@ class GroupActivity : DatabaseLockActivity(), private var mSearchSuggestionAdapter: SearchEntryCursorAdapter? = null private var mOnSuggestionListener: SearchView.OnSuggestionListener? = null + private var mAutofillActivityResultLauncher: ActivityResultLauncher? = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + AutofillHelper.buildActivityResultLauncher(this) + else null + private var mIconColor: Int = 0 override fun onCreate(savedInstanceState: Bundle?) { @@ -243,6 +250,7 @@ class GroupActivity : DatabaseLockActivity(), EntryEditActivity.launchForAutofillResult( this@GroupActivity, database, + mAutofillActivityResultLauncher, autofillComponent, currentGroup.nodeId, searchInfo @@ -1080,10 +1088,6 @@ class GroupActivity : DatabaseLockActivity(), mGroupEditViewModel.selectIcon(icon) } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data) - } - // Directly used the onActivityResult in fragment mGroupFragment?.onActivityResult(requestCode, resultCode, data) } @@ -1292,8 +1296,9 @@ class GroupActivity : DatabaseLockActivity(), * ------------------------- */ @RequiresApi(api = Build.VERSION_CODES.O) - fun launchForAutofillResult(activity: Activity, + fun launchForAutofillResult(activity: AppCompatActivity, database: Database, + activityResultLaunch: ActivityResultLauncher?, autofillComponent: AutofillComponent, searchInfo: SearchInfo? = null, autoSearch: Boolean = false) { @@ -1303,6 +1308,7 @@ class GroupActivity : DatabaseLockActivity(), AutofillHelper.startActivityForAutofillResult( activity, intent, + activityResultLaunch, autofillComponent, searchInfo ) @@ -1335,11 +1341,12 @@ class GroupActivity : DatabaseLockActivity(), * Global Launch * ------------------------- */ - fun launch(activity: Activity, + fun launch(activity: AppCompatActivity, database: Database, onValidateSpecialMode: () -> Unit, onCancelSpecialMode: () -> Unit, - onLaunchActivitySpecialMode: () -> Unit) { + onLaunchActivitySpecialMode: () -> Unit, + autofillActivityResultLauncher: ActivityResultLauncher?) { EntrySelectionHelper.doSpecialAction(activity.intent, { GroupActivity.launch( @@ -1451,6 +1458,7 @@ class GroupActivity : DatabaseLockActivity(), // Here no search info found, disable auto search GroupActivity.launchForAutofillResult(activity, database, + autofillActivityResultLauncher, autofillComponent, searchInfo, false) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt index e2973d645..a6f6c8999 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt @@ -35,9 +35,10 @@ import android.view.KeyEvent.KEYCODE_ENTER import android.view.inputmethod.EditorInfo.IME_ACTION_DONE import android.view.inputmethod.InputMethodManager import android.widget.* -import android.widget.TextView.OnEditorActionListener +import androidx.activity.result.ActivityResultLauncher import androidx.activity.viewModels import androidx.annotation.RequiresApi +import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.app.ActivityCompat @@ -75,7 +76,7 @@ import com.kunzisoft.keepass.viewmodels.DatabaseFileViewModel import java.io.FileNotFoundException -open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderListener { +class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.BuilderListener { // Views private var toolbar: Toolbar? = null @@ -113,6 +114,11 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui private var mAllowAutoOpenBiometricPrompt: Boolean = true + private var mAutofillActivityResultLauncher: ActivityResultLauncher? = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + AutofillHelper.buildActivityResultLauncher(this) + else null + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -361,7 +367,8 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui database, { onValidateSpecialMode() }, { onCancelSpecialMode() }, - { onLaunchActivitySpecialMode() } + { onLaunchActivitySpecialMode() }, + mAutofillActivityResultLauncher ) } } @@ -720,11 +727,6 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui // To get device credential unlock result advancedUnlockFragment?.onActivityResult(requestCode, resultCode, data) - // To get entry in result - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data) - } - var keyFileResult = false mExternalFileHelper?.let { keyFileResult = it.onOpenDocumentResult(requestCode, resultCode, data) { uri -> @@ -855,15 +857,17 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui @RequiresApi(api = Build.VERSION_CODES.O) @Throws(FileNotFoundException::class) - fun launchForAutofillResult(activity: Activity, + fun launchForAutofillResult(activity: AppCompatActivity, databaseFile: Uri, keyFile: Uri?, + activityResultLauncher: ActivityResultLauncher?, autofillComponent: AutofillComponent, searchInfo: SearchInfo?) { buildAndLaunchIntent(activity, databaseFile, keyFile) { intent -> AutofillHelper.startActivityForAutofillResult( activity, intent, + activityResultLauncher, autofillComponent, searchInfo) } @@ -891,12 +895,13 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui * Global Launch * ------------------------- */ - fun launch(activity: Activity, + fun launch(activity: AppCompatActivity, databaseUri: Uri, keyFile: Uri?, fileNoFoundAction: (exception: FileNotFoundException) -> Unit, onCancelSpecialMode: () -> Unit, - onLaunchActivitySpecialMode: () -> Unit) { + onLaunchActivitySpecialMode: () -> Unit, + autofillActivityResultLauncher: ActivityResultLauncher?) { try { EntrySelectionHelper.doSpecialAction(activity.intent, @@ -926,6 +931,7 @@ open class PasswordActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bui if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { PasswordActivity.launchForAutofillResult(activity, databaseUri, keyFile, + autofillActivityResultLauncher, autofillComponent, searchInfo) onLaunchActivitySpecialMode() diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt index 760639832..98fa80d1b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt @@ -38,7 +38,10 @@ import android.view.inputmethod.InlineSuggestionsRequest import android.widget.RemoteViews import android.widget.Toast import android.widget.inline.InlinePresentationSpec +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.RequiresApi +import androidx.appcompat.app.AppCompatActivity import androidx.autofill.inline.UiVersions import androidx.autofill.inline.v1.InlineSuggestionUi import androidx.core.content.ContextCompat @@ -48,19 +51,17 @@ import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper import com.kunzisoft.keepass.activities.helpers.SpecialMode import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.database.element.icon.IconImage +import com.kunzisoft.keepass.database.element.template.TemplateField import com.kunzisoft.keepass.model.EntryInfo import com.kunzisoft.keepass.model.SearchInfo -import com.kunzisoft.keepass.database.element.template.TemplateField import com.kunzisoft.keepass.settings.AutofillSettingsActivity import com.kunzisoft.keepass.settings.PreferencesUtil -import kotlin.collections.ArrayList +import com.kunzisoft.keepass.utils.LOCK_ACTION @RequiresApi(api = Build.VERSION_CODES.O) object AutofillHelper { - private const val AUTOFILL_RESPONSE_REQUEST_CODE = 8165 - private const val EXTRA_ASSIST_STRUCTURE = AutofillManager.EXTRA_ASSIST_STRUCTURE const val EXTRA_INLINE_SUGGESTIONS_REQUEST = "com.kunzisoft.keepass.autofill.INLINE_SUGGESTIONS_REQUEST" @@ -430,11 +431,33 @@ object AutofillHelper { } } + fun buildActivityResultLauncher(activity: AppCompatActivity, + lockDatabase: Boolean = false): ActivityResultLauncher { + return activity.registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { + // Utility method to loop and close each activity with return data + if (it.resultCode == Activity.RESULT_OK) { + activity.setResult(it.resultCode, it.data) + } + if (it.resultCode == Activity.RESULT_CANCELED) { + activity.setResult(Activity.RESULT_CANCELED) + } + activity.finish() + + if (lockDatabase && PreferencesUtil.isAutofillCloseDatabaseEnable(activity)) { + // Close the database + activity.sendBroadcast(Intent(LOCK_ACTION)) + } + } + } + /** * Utility method to start an activity with an Autofill for result */ - fun startActivityForAutofillResult(activity: Activity, + fun startActivityForAutofillResult(activity: AppCompatActivity, intent: Intent, + activityResultLauncher: ActivityResultLauncher?, autofillComponent: AutofillComponent, searchInfo: SearchInfo?) { EntrySelectionHelper.addSpecialModeInIntent(intent, SpecialMode.SELECTION) @@ -446,21 +469,6 @@ object AutofillHelper { } } EntrySelectionHelper.addSearchInfoInIntent(intent, searchInfo) - activity.startActivityForResult(intent, AUTOFILL_RESPONSE_REQUEST_CODE) - } - - /** - * Utility method to loop and close each activity with return data - */ - fun onActivityResultSetResultAndFinish(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) { - if (requestCode == AUTOFILL_RESPONSE_REQUEST_CODE) { - if (resultCode == Activity.RESULT_OK) { - activity.setResult(resultCode, data) - } - if (resultCode == Activity.RESULT_CANCELED) { - activity.setResult(Activity.RESULT_CANCELED) - } - activity.finish() - } + activityResultLauncher?.launch(intent) } }