mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
fix: Callback after registration
This commit is contained in:
@@ -378,36 +378,6 @@ class EntryEditActivity : DatabaseLockActivity(),
|
|||||||
} ?: run {
|
} ?: run {
|
||||||
updateEntry(entrySave.oldEntry, entrySave.newEntry)
|
updateEntry(entrySave.oldEntry, entrySave.newEntry)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't wait for saving if it's to provide autofill
|
|
||||||
mDatabase?.let { database ->
|
|
||||||
EntrySelectionHelper.doSpecialAction(
|
|
||||||
intent = intent,
|
|
||||||
defaultAction = {},
|
|
||||||
searchAction = {},
|
|
||||||
selectionAction = { intentSender, typeMode, searchInfo ->
|
|
||||||
when(typeMode) {
|
|
||||||
TypeMode.DEFAULT -> {}
|
|
||||||
TypeMode.MAGIKEYBOARD ->
|
|
||||||
entryValidatedForKeyboardSelection(database, entrySave.newEntry)
|
|
||||||
TypeMode.PASSKEY ->
|
|
||||||
entryValidatedForPasskey(database, entrySave.newEntry)
|
|
||||||
TypeMode.AUTOFILL ->
|
|
||||||
entryValidatedForAutofill(database, entrySave.newEntry)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
registrationAction = { intentSender, typeMode, registerInfo ->
|
|
||||||
when(typeMode) {
|
|
||||||
TypeMode.DEFAULT -> {}
|
|
||||||
TypeMode.MAGIKEYBOARD -> {}
|
|
||||||
TypeMode.PASSKEY ->
|
|
||||||
entryValidatedForPasskey(database, entrySave.newEntry)
|
|
||||||
TypeMode.AUTOFILL ->
|
|
||||||
entryValidatedForAutofill(database, entrySave.newEntry)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lifecycleScope.launch {
|
lifecycleScope.launch {
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherVie
|
|||||||
import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherViewModel.UIState
|
import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherViewModel.UIState
|
||||||
import com.kunzisoft.keepass.database.ContextualDatabase
|
import com.kunzisoft.keepass.database.ContextualDatabase
|
||||||
import com.kunzisoft.keepass.hardware.HardwareKey
|
import com.kunzisoft.keepass.hardware.HardwareKey
|
||||||
import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
|
|
||||||
import com.kunzisoft.keepass.tasks.ActionRunnable
|
import com.kunzisoft.keepass.tasks.ActionRunnable
|
||||||
import com.kunzisoft.keepass.utils.AppUtil.openExternalApp
|
import com.kunzisoft.keepass.utils.AppUtil.openExternalApp
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
@@ -84,12 +83,8 @@ class HardwareKeyActivity: DatabaseModeActivity(){
|
|||||||
result: ActionRunnable.Result
|
result: ActionRunnable.Result
|
||||||
) {
|
) {
|
||||||
super.onDatabaseActionFinished(database, actionTask, result)
|
super.onDatabaseActionFinished(database, actionTask, result)
|
||||||
when (actionTask) {
|
|
||||||
ACTION_DATABASE_LOAD_TASK -> {
|
|
||||||
finish()
|
finish()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun showHardwareKeyDriverNeeded(
|
private fun showHardwareKeyDriverNeeded(
|
||||||
context: Context,
|
context: Context,
|
||||||
|
|||||||
Reference in New Issue
Block a user