diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1863e3db0..c4dd5bef2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -179,7 +179,8 @@
             android:name="com.kunzisoft.keepass.settings.AppearanceSettingsActivity" />
         <activity
             android:name="com.kunzisoft.keepass.hardware.HardwareKeyActivity"
-            android:theme="@style/Theme.Transparent" />
+            android:theme="@style/Theme.Transparent"
+            android:exported="false" />
         <activity
             android:name="com.kunzisoft.keepass.credentialprovider.activity.AutofillLauncherActivity"
             android:theme="@style/Theme.Transparent"
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
index 9318a6167..ae4f5a75b 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
@@ -86,9 +86,10 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
         private const val NEW_FILE_DATABASE_INFO = "NEW_FILE_DATABASE_INFO"
         private const val READ_ONLY_DATABASE = "READ_ONLY_DATABASE"
 
-        fun getInstance(oldSnapFileDatabaseInfo: SnapFileDatabaseInfo,
-                        newSnapFileDatabaseInfo: SnapFileDatabaseInfo,
-                        readOnly: Boolean
+        fun getInstance(
+            oldSnapFileDatabaseInfo: SnapFileDatabaseInfo,
+            newSnapFileDatabaseInfo: SnapFileDatabaseInfo,
+            readOnly: Boolean
         )
         : DatabaseChangedDialogFragment {
             val fragment = DatabaseChangedDialogFragment()
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt
index f3643c526..4f9860753 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt
@@ -6,8 +6,8 @@ import android.view.View
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.buildActivityResultLauncher
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.isIntentSenderMode
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.removeInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.removeModes
@@ -15,6 +15,7 @@ import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveReg
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSearchInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSpecialMode
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveTypeMode
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.setActivityResult
 import com.kunzisoft.keepass.credentialprovider.SpecialMode
 import com.kunzisoft.keepass.credentialprovider.TypeMode
 import com.kunzisoft.keepass.model.RegisterInfo
@@ -33,8 +34,20 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
 
     private var mToolbarSpecial: ToolbarSpecial? = null
 
+    /**
+     * Utility activity result launcher,
+     * Used recursively, close each activity with return data
+     */
     protected open var mCredentialActivityResultLauncher: ActivityResultLauncher<Intent>? =
-        this.buildActivityResultLauncher()
+        registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) {
+        setActivityResult(
+            lockDatabase = false,
+            resultCode = it.resultCode,
+            data = it.data
+        )
+    }
 
     open fun onDatabaseBackPressed() {
         if (mSpecialMode != SpecialMode.DEFAULT)
diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt
index 384d5a8b2..cf66cf9fa 100644
--- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt
@@ -29,9 +29,7 @@ import android.os.ParcelUuid
 import android.util.Log
 import android.widget.RemoteViews
 import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.ContextualDatabase
@@ -77,25 +75,6 @@ object EntrySelectionHelper {
         }
     }
 
-    /**
-     * Utility method to build a registerForActivityResult,
-     * Used recursively, close each activity with return data
-     */
-    fun AppCompatActivity.buildActivityResultLauncher(
-        lockDatabase: Boolean = false,
-        dataTransformation: (data: Intent?) -> Intent? = { it },
-    ): ActivityResultLauncher<Intent> {
-        return this.registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()
-        ) {
-            setActivityResult(
-                lockDatabase,
-                it.resultCode,
-                dataTransformation(it.data)
-            )
-        }
-    }
-
     fun startActivityForSearchModeResult(
         context: Context,
         intent: Intent,
diff --git a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt
index cd746d88c..1e19504c3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt
@@ -24,7 +24,7 @@ class HardwareKeyActivity: DatabaseModeActivity(){
 
     // To manage hardware key challenge response
     private val resultCallback = ActivityResultCallback<ActivityResult> { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
+        if (result.resultCode == RESULT_OK) {
             val challengeResponse: ByteArray? = result.data?.getByteArrayExtra(HARDWARE_KEY_RESPONSE_KEY)
             Log.d(TAG, "Response form challenge")
             mDatabaseTaskProvider?.startChallengeResponded(challengeResponse ?: ByteArray(0))