rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Small refactoring

Browse Source
This commit is contained in:
J-Jamet
2025-10-01 15:41:49 +02:00
parent 75b37f5a9f
commit a337de3679
4 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View File

@@ -385,9 +385,9 @@ class EntryEditActivity : DatabaseLockActivity(),
TypeMode.MAGIKEYBOARD -> TypeMode.MAGIKEYBOARD ->
entryValidatedForKeyboardSelection(database, entrySave.newEntry) entryValidatedForKeyboardSelection(database, entrySave.newEntry)
TypeMode.PASSKEY -> TypeMode.PASSKEY ->
entryValidatedForPasskeySelection(database, entrySave.newEntry) entryValidatedForPasskey(database, entrySave.newEntry)
TypeMode.AUTOFILL -> TypeMode.AUTOFILL ->
entryValidatedForAutofillSelection(database, entrySave.newEntry) entryValidatedForAutofill(database, entrySave.newEntry)
} }
}, },
registrationAction = { intentSender, typeMode, registerInfo -> registrationAction = { intentSender, typeMode, registerInfo ->
@@ -395,9 +395,9 @@ class EntryEditActivity : DatabaseLockActivity(),
TypeMode.DEFAULT -> {} TypeMode.DEFAULT -> {}
TypeMode.MAGIKEYBOARD -> {} TypeMode.MAGIKEYBOARD -> {}
TypeMode.PASSKEY -> TypeMode.PASSKEY ->
entryValidatedForPasskeyRegistration(database, entrySave.newEntry) entryValidatedForPasskey(database, entrySave.newEntry)
TypeMode.AUTOFILL -> TypeMode.AUTOFILL ->
entryValidatedForAutofillRegistration(database, entrySave.newEntry) entryValidatedForAutofill(database, entrySave.newEntry)
} }
} }
) )
@@ -451,9 +451,9 @@ class EntryEditActivity : DatabaseLockActivity(),
TypeMode.MAGIKEYBOARD -> TypeMode.MAGIKEYBOARD ->
entryValidatedForKeyboardSelection(database, entry) entryValidatedForKeyboardSelection(database, entry)
TypeMode.PASSKEY -> TypeMode.PASSKEY ->
entryValidatedForPasskeySelection(database, entry) entryValidatedForPasskey(database, entry)
TypeMode.AUTOFILL -> TypeMode.AUTOFILL ->
entryValidatedForAutofillSelection(database, entry) entryValidatedForAutofill(database, entry)
} }
}, },
registrationAction = { _, typeMode, _ -> registrationAction = { _, typeMode, _ ->
@@ -462,9 +462,9 @@ class EntryEditActivity : DatabaseLockActivity(),
entryValidatedForSave(entry) entryValidatedForSave(entry)
TypeMode.MAGIKEYBOARD -> {} TypeMode.MAGIKEYBOARD -> {}
TypeMode.PASSKEY -> TypeMode.PASSKEY ->
entryValidatedForPasskeyRegistration(database, entry) entryValidatedForPasskey(database, entry)
TypeMode.AUTOFILL -> TypeMode.AUTOFILL ->
entryValidatedForAutofillRegistration(database, entry) entryValidatedForAutofill(database, entry)
} }
} }
) )
@@ -494,7 +494,7 @@ class EntryEditActivity : DatabaseLockActivity(),
finishForEntryResult(entry) finishForEntryResult(entry)
} }
private fun entryValidatedForAutofillSelection(database: ContextualDatabase, entry: Entry) { private fun entryValidatedForAutofill(database: ContextualDatabase, entry: Entry) {
// Build Autofill response with the entry selected // Build Autofill response with the entry selected
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
this.buildSpecialModeResponseAndSetResult( this.buildSpecialModeResponseAndSetResult(
@@ -505,27 +505,7 @@ class EntryEditActivity : DatabaseLockActivity(),
onValidateSpecialMode() onValidateSpecialMode()
} }
private fun entryValidatedForPasskeySelection(database: ContextualDatabase, entry: Entry) { private fun entryValidatedForPasskey(database: ContextualDatabase, entry: Entry) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
this.buildPasskeyResponseAndSetResult(
entryInfo = entry.getEntryInfo(database),
extras = buildEntryResult(entry)
)
}
onValidateSpecialMode()
}
private fun entryValidatedForAutofillRegistration(database: ContextualDatabase, entry: Entry) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
this.buildSpecialModeResponseAndSetResult(
entryInfo = entry.getEntryInfo(database),
extras = buildEntryResult(entry)
)
}
onValidateSpecialMode()
}
private fun entryValidatedForPasskeyRegistration(database: ContextualDatabase, entry: Entry) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
this.buildPasskeyResponseAndSetResult( this.buildPasskeyResponseAndSetResult(
entryInfo = entry.getEntryInfo(database), entryInfo = entry.getEntryInfo(database),

8
app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
View File

@@ -19,7 +19,6 @@
*/ */
package com.kunzisoft.keepass.activities package com.kunzisoft.keepass.activities
import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
@@ -341,7 +340,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
{ onValidateSpecialMode() }, { onValidateSpecialMode() },
{ onCancelSpecialMode() }, { onCancelSpecialMode() },
{ onLaunchActivitySpecialMode() }, { onLaunchActivitySpecialMode() },
mCredentialActivityResultLauncher) mCredentialActivityResultLauncher
)
} }
} }
@@ -515,9 +515,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
*/ */
fun launchForRegistration( fun launchForRegistration(
context: Context, context: Context,
activityResultLauncher: ActivityResultLauncher<Intent>?, typeMode: TypeMode,
registerInfo: RegisterInfo? = null, registerInfo: RegisterInfo? = null,
typeMode: TypeMode activityResultLauncher: ActivityResultLauncher<Intent>?,
) { ) {
EntrySelectionHelper.startActivityForRegistrationModeResult( EntrySelectionHelper.startActivityForRegistrationModeResult(
context = context, context = context,

4
app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
View File

@@ -1546,10 +1546,10 @@ class GroupActivity : DatabaseLockActivity(),
*/ */
fun launchForRegistration( fun launchForRegistration(
context: Context, context: Context,
activityResultLauncher: ActivityResultLauncher<Intent>?,
database: ContextualDatabase, database: ContextualDatabase,
typeMode: TypeMode,
registerInfo: RegisterInfo? = null, registerInfo: RegisterInfo? = null,
typeMode: TypeMode activityResultLauncher: ActivityResultLauncher<Intent>?,
) { ) {
if (database.loaded && !database.isReadOnly) { if (database.loaded && !database.isReadOnly) {
checkTimeAndBuildIntent(context, null) { intent -> checkTimeAndBuildIntent(context, null) { intent ->

14
app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
View File

@@ -133,33 +133,33 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
context = this@PasskeyLauncherActivity, context = this@PasskeyLauncherActivity,
database = uiState.database, database = uiState.database,
typeMode = uiState.typeMode, typeMode = uiState.typeMode,
activityResultLauncher = mPasskeySelectionActivityResultLauncher, searchInfo = uiState.searchInfo,
searchInfo = uiState.searchInfo activityResultLauncher = mPasskeySelectionActivityResultLauncher
) )
} }
is CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration -> { is CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration -> {
GroupActivity.launchForRegistration( GroupActivity.launchForRegistration(
context = this@PasskeyLauncherActivity, context = this@PasskeyLauncherActivity,
activityResultLauncher = mPasskeyRegistrationActivityResultLauncher,
database = uiState.database, database = uiState.database,
typeMode = uiState.typeMode,
registerInfo = uiState.registerInfo, registerInfo = uiState.registerInfo,
typeMode = uiState.typeMode activityResultLauncher = mPasskeyRegistrationActivityResultLauncher
) )
} }
is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForSelection -> { is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForSelection -> {
FileDatabaseSelectActivity.launchForSelection( FileDatabaseSelectActivity.launchForSelection(
context = this@PasskeyLauncherActivity, context = this@PasskeyLauncherActivity,
typeMode = uiState.typeMode, typeMode = uiState.typeMode,
activityResultLauncher = mPasskeySelectionActivityResultLauncher,
searchInfo = uiState.searchInfo, searchInfo = uiState.searchInfo,
activityResultLauncher = mPasskeySelectionActivityResultLauncher
) )
} }
is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForRegistration -> { is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForRegistration -> {
FileDatabaseSelectActivity.launchForRegistration( FileDatabaseSelectActivity.launchForRegistration(
context = this@PasskeyLauncherActivity, context = this@PasskeyLauncherActivity,
activityResultLauncher = mPasskeyRegistrationActivityResultLauncher, typeMode = uiState.typeMode,
registerInfo = uiState.registerInfo, registerInfo = uiState.registerInfo,
typeMode = uiState.typeMode activityResultLauncher = mPasskeyRegistrationActivityResultLauncher,
) )
} }
} }