From 259c8a4bd90bcba5ef76ec0333425486efa4f747 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 18 May 2022 16:39:35 +0200 Subject: [PATCH] Setting to remember hardware key --- .../2.json | 90 +++++++++++ .../activities/FileDatabaseSelectActivity.kt | 14 +- .../activities/MainCredentialActivity.kt | 152 +++++++++++++----- .../keepass/app/database/AppDatabase.kt | 9 +- .../app/database/FileDatabaseHistoryAction.kt | 51 +++--- .../app/database/FileDatabaseHistoryEntity.kt | 3 + .../database/action/CreateDatabaseRunnable.kt | 7 +- .../database/action/LoadDatabaseRunnable.kt | 7 +- .../kunzisoft/keepass/hardware/HardwareKey.kt | 8 +- .../kunzisoft/keepass/model/DatabaseFile.kt | 2 + .../keepass/settings/PreferencesUtil.kt | 6 + .../com/kunzisoft/keepass/utils/UriUtil.kt | 6 +- .../keepass/view/HardwareKeySelectionView.kt | 8 +- .../keepass/view/MainCredentialView.kt | 13 ++ .../viewmodels/DatabaseFilesViewModel.kt | 10 +- app/src/main/res/values/donottranslate.xml | 2 + app/src/main/res/values/strings.xml | 2 + .../main/res/xml/preferences_application.xml | 9 +- 18 files changed, 319 insertions(+), 80 deletions(-) create mode 100644 app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json diff --git a/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json b/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json new file mode 100644 index 000000000..a6e3f6fac --- /dev/null +++ b/app/schemas/com.kunzisoft.keepass.app.database.AppDatabase/2.json @@ -0,0 +1,90 @@ +{ + "formatVersion": 1, + "database": { + "version": 2, + "identityHash": "f8fb4aed546de19ae7ca0797f49b26a4", + "entities": [ + { + "tableName": "file_database_history", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `database_alias` TEXT NOT NULL, `keyfile_uri` TEXT, `hardware_key` TEXT, `updated` INTEGER NOT NULL, PRIMARY KEY(`database_uri`))", + "fields": [ + { + "fieldPath": "databaseUri", + "columnName": "database_uri", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "databaseAlias", + "columnName": "database_alias", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "keyFileUri", + "columnName": "keyfile_uri", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "hardwareKey", + "columnName": "hardware_key", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "updated", + "columnName": "updated", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "columnNames": [ + "database_uri" + ], + "autoGenerate": false + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "cipher_database", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`database_uri` TEXT NOT NULL, `encrypted_value` TEXT NOT NULL, `specs_parameters` TEXT NOT NULL, PRIMARY KEY(`database_uri`))", + "fields": [ + { + "fieldPath": "databaseUri", + "columnName": "database_uri", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "encryptedValue", + "columnName": "encrypted_value", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "specParameters", + "columnName": "specs_parameters", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "columnNames": [ + "database_uri" + ], + "autoGenerate": false + }, + "indices": [], + "foreignKeys": [] + } + ], + "views": [], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f8fb4aed546de19ae7ca0797f49b26a4')" + ] + } +} \ No newline at end of file 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 e001841ed..0918ce702 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -56,6 +56,7 @@ import com.kunzisoft.keepass.autofill.AutofillHelper import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation import com.kunzisoft.keepass.database.element.MainCredential +import com.kunzisoft.keepass.hardware.HardwareKey import com.kunzisoft.keepass.model.RegisterInfo import com.kunzisoft.keepass.model.SearchInfo import com.kunzisoft.keepass.services.DatabaseTaskNotificationService @@ -155,8 +156,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), mAdapterDatabaseHistory?.setOnFileDatabaseHistoryOpenListener { fileDatabaseHistoryEntityToOpen -> fileDatabaseHistoryEntityToOpen.databaseUri?.let { databaseFileUri -> launchPasswordActivity( - databaseFileUri, - fileDatabaseHistoryEntityToOpen.keyFileUri + databaseFileUri, + fileDatabaseHistoryEntityToOpen.keyFileUri, + fileDatabaseHistoryEntityToOpen.hardwareKey ) } } @@ -250,7 +252,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), ?: MainCredential() databaseFilesViewModel.addDatabaseFile( databaseUri, - mainCredential.keyFileUri + mainCredential.keyFileUri, + mainCredential.hardwareKey ) } } @@ -297,10 +300,11 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), Snackbar.make(coordinatorLayout, error, Snackbar.LENGTH_LONG).asError().show() } - private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?) { + private fun launchPasswordActivity(databaseUri: Uri, keyFile: Uri?, hardwareKey: HardwareKey?) { MainCredentialActivity.launch(this, databaseUri, keyFile, + hardwareKey, { exception -> fileNoFoundAction(exception) }, @@ -321,7 +325,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), } private fun launchPasswordActivityWithPath(databaseUri: Uri) { - launchPasswordActivity(databaseUri, null) + launchPasswordActivity(databaseUri, null, null) // Delete flickering for kitkat <= if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) overridePendingTransition(0, 0) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt index 8edeaaf5b..2d6312e36 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt @@ -60,6 +60,7 @@ import com.kunzisoft.keepass.database.element.MainCredential import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException import com.kunzisoft.keepass.database.exception.FileNotFoundDatabaseException import com.kunzisoft.keepass.education.PasswordActivityEducation +import com.kunzisoft.keepass.hardware.HardwareKey import com.kunzisoft.keepass.model.* import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.CIPHER_DATABASE_KEY @@ -102,6 +103,8 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu private var mRememberKeyFile: Boolean = false private var mExternalFileHelper: ExternalFileHelper? = null + private var mRememberHardwareKey: Boolean = false + private var mReadOnly: Boolean = false private var mForceReadOnly: Boolean = false @@ -134,6 +137,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu PreferencesUtil.enableReadOnlyDatabase(this) } mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this) + mRememberHardwareKey = PreferencesUtil.rememberHardwareKey(this) // Build elements to manage keyfile selection mExternalFileHelper = ExternalFileHelper(this) @@ -216,10 +220,19 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu databaseKeyFileUri } + val databaseHardwareKey = mainCredentialView?.getMainCredential()?.hardwareKey + val hardwareKey = + if (mRememberHardwareKey + && databaseHardwareKey == null) { + databaseFile?.hardwareKey + } else { + databaseHardwareKey + } + // Define title filenameView?.text = databaseFile?.databaseAlias ?: "" - onDatabaseFileLoaded(databaseFile?.databaseUri, keyFileUri) + onDatabaseFileLoaded(databaseFile?.databaseUri, keyFileUri, hardwareKey) } } @@ -227,6 +240,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu super.onResume() mRememberKeyFile = PreferencesUtil.rememberKeyFileLocations(this@MainCredentialActivity) + mRememberHardwareKey = PreferencesUtil.rememberHardwareKey(this@MainCredentialActivity) // Back to previous keyboard is setting activated if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this@MainCredentialActivity)) { @@ -344,24 +358,36 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu private fun getUriFromIntent(intent: Intent?) { // If is a view intent val action = intent?.action - if (action != null - && action == VIEW_INTENT) { - mDatabaseFileUri = intent.data - mainCredentialView?.populateKeyFileView(UriUtil.getUriFromIntent(intent, KEY_KEYFILE)) + if (action == VIEW_INTENT) { + fillCredentials( + intent.data, + UriUtil.getUriFromIntent(intent, KEY_KEYFILE), + HardwareKey.getHardwareKeyFromString(intent.getStringExtra(KEY_HARDWARE_KEY)) + ) } else { - mDatabaseFileUri = intent?.getParcelableExtra(KEY_FILENAME) - intent?.getParcelableExtra(KEY_KEYFILE)?.let { - mainCredentialView?.populateKeyFileView(it) - } + fillCredentials( + intent?.getParcelableExtra(KEY_FILENAME), + intent?.getParcelableExtra(KEY_KEYFILE), + HardwareKey.getHardwareKeyFromString(intent?.getStringExtra(KEY_HARDWARE_KEY)) + ) } try { intent?.removeExtra(KEY_KEYFILE) + intent?.removeExtra(KEY_HARDWARE_KEY) } catch (e: Exception) {} mDatabaseFileUri?.let { mDatabaseFileViewModel.checkIfIsDefaultDatabase(it) } } + private fun fillCredentials(databaseUri: Uri?, + keyFileUri: Uri?, + hardwareKey: HardwareKey?) { + mDatabaseFileUri = databaseUri + mainCredentialView?.populateKeyFileView(keyFileUri) + mainCredentialView?.populateHardwareKeyView(hardwareKey) + } + override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) getUriFromIntent(intent) @@ -370,7 +396,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu private fun launchGroupActivityIfLoaded(database: Database) { // Check if database really loaded if (database.loaded) { - clearCredentialsViews(true) + clearCredentialsViews(clearKeyFile = true, clearHardwareKey = true) GroupActivity.launch(this, database, { onValidateSpecialMode() }, @@ -435,12 +461,19 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu ) } - private fun onDatabaseFileLoaded(databaseFileUri: Uri?, keyFileUri: Uri?) { + private fun onDatabaseFileLoaded(databaseFileUri: Uri?, + keyFileUri: Uri?, + hardwareKey: HardwareKey?) { // Define Key File text if (mRememberKeyFile) { mainCredentialView?.populateKeyFileView(keyFileUri) } + // Define hardware key + if (mRememberHardwareKey) { + mainCredentialView?.populateHardwareKeyView(hardwareKey) + } + // Define listener for validate button confirmButtonView?.setOnClickListener { mainCredentialView?.validateCredential() @@ -476,11 +509,15 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu } } - private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile) { + private fun clearCredentialsViews(clearKeyFile: Boolean = !mRememberKeyFile, + clearHardwareKey: Boolean = !mRememberHardwareKey) { mainCredentialView?.populatePasswordTextView(null) if (clearKeyFile) { mainCredentialView?.populateKeyFileView(null) } + if (clearHardwareKey) { + mainCredentialView?.populateHardwareKeyView(null) + } } override fun onPause() { @@ -670,18 +707,24 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu private const val KEY_FILENAME = "fileName" private const val KEY_KEYFILE = "keyFile" + private const val KEY_HARDWARE_KEY = "hardwareKey" private const val VIEW_INTENT = "android.intent.action.VIEW" private const val KEY_READ_ONLY = "KEY_READ_ONLY" private const val KEY_PASSWORD = "password" private const val KEY_LAUNCH_IMMEDIATELY = "launchImmediately" - private fun buildAndLaunchIntent(activity: Activity, databaseFile: Uri, keyFile: Uri?, + private fun buildAndLaunchIntent(activity: Activity, + databaseFile: Uri, + keyFile: Uri?, + hardwareKey: HardwareKey?, intentBuildLauncher: (Intent) -> Unit) { val intent = Intent(activity, MainCredentialActivity::class.java) intent.putExtra(KEY_FILENAME, databaseFile) if (keyFile != null) intent.putExtra(KEY_KEYFILE, keyFile) + if (hardwareKey != null) + intent.putExtra(KEY_HARDWARE_KEY, hardwareKey.toString()) intentBuildLauncher.invoke(intent) } @@ -694,8 +737,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu @Throws(FileNotFoundException::class) fun launch(activity: Activity, databaseFile: Uri, - keyFile: Uri?) { - buildAndLaunchIntent(activity, databaseFile, keyFile) { intent -> + keyFile: Uri?, + hardwareKey: HardwareKey?) { + buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent -> activity.startActivity(intent) } } @@ -710,8 +754,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu fun launchForSearchResult(activity: Activity, databaseFile: Uri, keyFile: Uri?, + hardwareKey: HardwareKey?, searchInfo: SearchInfo) { - buildAndLaunchIntent(activity, databaseFile, keyFile) { intent -> + buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent -> EntrySelectionHelper.startActivityForSearchModeResult( activity, intent, @@ -729,8 +774,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu fun launchForSaveResult(activity: Activity, databaseFile: Uri, keyFile: Uri?, + hardwareKey: HardwareKey?, searchInfo: SearchInfo) { - buildAndLaunchIntent(activity, databaseFile, keyFile) { intent -> + buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent -> EntrySelectionHelper.startActivityForSaveModeResult( activity, intent, @@ -748,8 +794,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu fun launchForKeyboardResult(activity: Activity, databaseFile: Uri, keyFile: Uri?, + hardwareKey: HardwareKey?, searchInfo: SearchInfo?) { - buildAndLaunchIntent(activity, databaseFile, keyFile) { intent -> + buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent -> EntrySelectionHelper.startActivityForKeyboardSelectionModeResult( activity, intent, @@ -768,10 +815,11 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu fun launchForAutofillResult(activity: AppCompatActivity, databaseFile: Uri, keyFile: Uri?, + hardwareKey: HardwareKey?, activityResultLauncher: ActivityResultLauncher?, autofillComponent: AutofillComponent, searchInfo: SearchInfo?) { - buildAndLaunchIntent(activity, databaseFile, keyFile) { intent -> + buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent -> AutofillHelper.startActivityForAutofillResult( activity, intent, @@ -789,8 +837,9 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu fun launchForRegistration(activity: Activity, databaseFile: Uri, keyFile: Uri?, + hardwareKey: HardwareKey?, registerInfo: RegisterInfo?) { - buildAndLaunchIntent(activity, databaseFile, keyFile) { intent -> + buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent -> EntrySelectionHelper.startActivityForRegistrationModeResult( activity, intent, @@ -806,6 +855,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu fun launch(activity: AppCompatActivity, databaseUri: Uri, keyFile: Uri?, + hardwareKey: HardwareKey?, fileNoFoundAction: (exception: FileNotFoundException) -> Unit, onCancelSpecialMode: () -> Unit, onLaunchActivitySpecialMode: () -> Unit, @@ -814,43 +864,67 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu try { EntrySelectionHelper.doSpecialAction(activity.intent, { - MainCredentialActivity.launch(activity, - databaseUri, keyFile) + launch( + activity, + databaseUri, + keyFile, + hardwareKey + ) }, { searchInfo -> // Search Action - MainCredentialActivity.launchForSearchResult(activity, - databaseUri, keyFile, - searchInfo) + launchForSearchResult( + activity, + databaseUri, + keyFile, + hardwareKey, + searchInfo + ) onLaunchActivitySpecialMode() }, { searchInfo -> // Save Action - MainCredentialActivity.launchForSaveResult(activity, - databaseUri, keyFile, - searchInfo) + launchForSaveResult( + activity, + databaseUri, + keyFile, + hardwareKey, + searchInfo + ) onLaunchActivitySpecialMode() }, { searchInfo -> // Keyboard Selection Action - MainCredentialActivity.launchForKeyboardResult(activity, - databaseUri, keyFile, - searchInfo) + launchForKeyboardResult( + activity, + databaseUri, + keyFile, + hardwareKey, + searchInfo + ) onLaunchActivitySpecialMode() }, { searchInfo, autofillComponent -> // Autofill Selection Action if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - MainCredentialActivity.launchForAutofillResult(activity, - databaseUri, keyFile, - autofillActivityResultLauncher, - autofillComponent, - searchInfo) + launchForAutofillResult( + activity, + databaseUri, + keyFile, + hardwareKey, + autofillActivityResultLauncher, + autofillComponent, + searchInfo + ) onLaunchActivitySpecialMode() } else { onCancelSpecialMode() } }, { registerInfo -> // Registration Action - MainCredentialActivity.launchForRegistration(activity, - databaseUri, keyFile, - registerInfo) + launchForRegistration( + activity, + databaseUri, + keyFile, + hardwareKey, + registerInfo + ) onLaunchActivitySpecialMode() } ) diff --git a/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt b/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt index 3597ceea4..16d1a190c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt +++ b/app/src/main/java/com/kunzisoft/keepass/app/database/AppDatabase.kt @@ -23,8 +23,15 @@ import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import android.content.Context +import androidx.room.AutoMigration -@Database(version = 1, entities = [FileDatabaseHistoryEntity::class, CipherDatabaseEntity::class]) +@Database( + version = 2, + entities = [FileDatabaseHistoryEntity::class, CipherDatabaseEntity::class], + autoMigrations = [ + AutoMigration (from = 1, to = 2) + ] +) abstract class AppDatabase : RoomDatabase() { abstract fun fileDatabaseHistoryDao(): FileDatabaseHistoryDao diff --git a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt index 0785ec45e..cce17c36d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt +++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt @@ -22,6 +22,7 @@ package com.kunzisoft.keepass.app.database import android.content.Context import android.net.Uri import android.util.Log +import com.kunzisoft.keepass.hardware.HardwareKey import com.kunzisoft.keepass.model.DatabaseFile import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.utils.SingletonHolderParameter @@ -44,6 +45,7 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) { DatabaseFile( databaseUri, UriUtil.parse(fileDatabaseHistoryEntity?.keyFileUri), + HardwareKey.getHardwareKeyFromString(fileDatabaseHistoryEntity?.hardwareKey), UriUtil.decode(fileDatabaseHistoryEntity?.databaseUri), fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity?.databaseAlias ?: ""), fileDatabaseInfo.exists, @@ -85,13 +87,14 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) { || !hideBrokenLocations) { databaseFileListLoaded.add( DatabaseFile( - UriUtil.parse(fileDatabaseHistoryEntity.databaseUri), - UriUtil.parse(fileDatabaseHistoryEntity.keyFileUri), - UriUtil.decode(fileDatabaseHistoryEntity.databaseUri), - fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias), - fileDatabaseInfo.exists, - fileDatabaseInfo.getLastModificationString(), - fileDatabaseInfo.getSizeString() + UriUtil.parse(fileDatabaseHistoryEntity.databaseUri), + UriUtil.parse(fileDatabaseHistoryEntity.keyFileUri), + HardwareKey.getHardwareKeyFromString(fileDatabaseHistoryEntity.hardwareKey), + UriUtil.decode(fileDatabaseHistoryEntity.databaseUri), + fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistoryEntity.databaseAlias), + fileDatabaseInfo.exists, + fileDatabaseInfo.getLastModificationString(), + fileDatabaseInfo.getSizeString() ) ) } @@ -107,11 +110,14 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) { ).execute() } - fun addOrUpdateDatabaseUri(databaseUri: Uri, keyFileUri: Uri? = null, + fun addOrUpdateDatabaseUri(databaseUri: Uri, + keyFileUri: Uri? = null, + hardwareKey: HardwareKey? = null, databaseFileAddedOrUpdatedResult: ((DatabaseFile?) -> Unit)? = null) { addOrUpdateDatabaseFile(DatabaseFile( - databaseUri, - keyFileUri + databaseUri, + keyFileUri, + hardwareKey ), databaseFileAddedOrUpdatedResult) } @@ -130,6 +136,7 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) { ?: fileDatabaseHistoryRetrieve?.databaseAlias ?: "", databaseFileToAddOrUpdate.keyFileUri?.toString(), + databaseFileToAddOrUpdate.hardwareKey?.value, System.currentTimeMillis() ) @@ -147,13 +154,14 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) { val fileDatabaseInfo = FileDatabaseInfo(applicationContext, fileDatabaseHistory.databaseUri) DatabaseFile( - UriUtil.parse(fileDatabaseHistory.databaseUri), - UriUtil.parse(fileDatabaseHistory.keyFileUri), - UriUtil.decode(fileDatabaseHistory.databaseUri), - fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistory.databaseAlias), - fileDatabaseInfo.exists, - fileDatabaseInfo.getLastModificationString(), - fileDatabaseInfo.getSizeString() + UriUtil.parse(fileDatabaseHistory.databaseUri), + UriUtil.parse(fileDatabaseHistory.keyFileUri), + HardwareKey.getHardwareKeyFromString(fileDatabaseHistory.hardwareKey), + UriUtil.decode(fileDatabaseHistory.databaseUri), + fileDatabaseInfo.retrieveDatabaseAlias(fileDatabaseHistory.databaseAlias), + fileDatabaseInfo.exists, + fileDatabaseInfo.getLastModificationString(), + fileDatabaseInfo.getSizeString() ) } }, @@ -172,10 +180,11 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) { val returnValue = databaseFileHistoryDao.delete(fileDatabaseHistory) if (returnValue > 0) { DatabaseFile( - UriUtil.parse(fileDatabaseHistory.databaseUri), - UriUtil.parse(fileDatabaseHistory.keyFileUri), - UriUtil.decode(fileDatabaseHistory.databaseUri), - databaseFileToDelete.databaseAlias + UriUtil.parse(fileDatabaseHistory.databaseUri), + UriUtil.parse(fileDatabaseHistory.keyFileUri), + HardwareKey.getHardwareKeyFromString(fileDatabaseHistory.hardwareKey), + UriUtil.decode(fileDatabaseHistory.databaseUri), + databaseFileToDelete.databaseAlias ) } else { null diff --git a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt index 470bec74c..96fd5df08 100644 --- a/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryEntity.kt @@ -35,6 +35,9 @@ data class FileDatabaseHistoryEntity( @ColumnInfo(name = "keyfile_uri") var keyFileUri: String?, + @ColumnInfo(name = "hardware_key") + var hardwareKey: String?, + @ColumnInfo(name = "updated") val updated: Long ) { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt index bf3a53954..fdd1a568b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt @@ -60,8 +60,11 @@ class CreateDatabaseRunnable(context: Context, // Add database to recent files if (PreferencesUtil.rememberDatabaseLocations(context)) { FileDatabaseHistoryAction.getInstance(context.applicationContext) - .addOrUpdateDatabaseUri(mDatabaseUri, - if (PreferencesUtil.rememberKeyFileLocations(context)) mainCredential.keyFileUri else null) + .addOrUpdateDatabaseUri( + mDatabaseUri, + if (PreferencesUtil.rememberKeyFileLocations(context)) mainCredential.keyFileUri else null, + if (PreferencesUtil.rememberHardwareKey(context)) mainCredential.hardwareKey else null, + ) } // Register the current time to init the lock timer diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt index 1051cc541..a72ca3080 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt @@ -75,8 +75,11 @@ class LoadDatabaseRunnable(private val context: Context, // Save keyFile in app database if (PreferencesUtil.rememberDatabaseLocations(context)) { FileDatabaseHistoryAction.getInstance(context) - .addOrUpdateDatabaseUri(mDatabaseUri, - if (PreferencesUtil.rememberKeyFileLocations(context)) mMainCredential.keyFileUri else null) + .addOrUpdateDatabaseUri( + mDatabaseUri, + if (PreferencesUtil.rememberKeyFileLocations(context)) mMainCredential.keyFileUri else null, + if (PreferencesUtil.rememberHardwareKey(context)) mMainCredential.hardwareKey else null, + ) } // Register the biometric diff --git a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKey.kt b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKey.kt index a8814454b..803cf96ca 100644 --- a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKey.kt +++ b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKey.kt @@ -4,6 +4,10 @@ enum class HardwareKey(val value: String) { FIDO2_SECRET("FIDO2 secret"), CHALLENGE_RESPONSE_YUBIKEY("Yubikey challenge-response"); + override fun toString(): String { + return value + } + companion object { val DEFAULT = FIDO2_SECRET @@ -19,7 +23,9 @@ enum class HardwareKey(val value: String) { } } - fun getHardwareKeyFromString(text: String): HardwareKey { + fun getHardwareKeyFromString(text: String?): HardwareKey? { + if (text == null) + return null values().find { it.value == text }?.let { return it } diff --git a/app/src/main/java/com/kunzisoft/keepass/model/DatabaseFile.kt b/app/src/main/java/com/kunzisoft/keepass/model/DatabaseFile.kt index 578fc4075..92470c2fe 100644 --- a/app/src/main/java/com/kunzisoft/keepass/model/DatabaseFile.kt +++ b/app/src/main/java/com/kunzisoft/keepass/model/DatabaseFile.kt @@ -1,9 +1,11 @@ package com.kunzisoft.keepass.model import android.net.Uri +import com.kunzisoft.keepass.hardware.HardwareKey data class DatabaseFile(var databaseUri: Uri? = null, var keyFileUri: Uri? = null, + var hardwareKey: HardwareKey? = null, var databaseDecodedPath: String? = null, var databaseAlias: String? = null, var databaseFileExists: Boolean = false, diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt index 77fcdc552..f46f2c4e6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt @@ -96,6 +96,12 @@ object PreferencesUtil { context.resources.getBoolean(R.bool.remember_keyfile_locations_default)) } + fun rememberHardwareKey(context: Context): Boolean { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getBoolean(context.getString(R.string.remember_hardware_key_key), + context.resources.getBoolean(R.bool.remember_hardware_key_default)) + } + fun automaticallyFocusSearch(context: Context): Boolean { val prefs = PreferenceManager.getDefaultSharedPreferences(context) return prefs.getBoolean(context.getString(R.string.auto_focus_search_key), diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt b/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt index 0286b837e..e06d9da15 100644 --- a/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt @@ -226,10 +226,10 @@ object UriUtil { } } - fun getUriFromIntent(intent: Intent, key: String): Uri? { + fun getUriFromIntent(intent: Intent?, key: String): Uri? { try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - val clipData = intent.clipData + val clipData = intent?.clipData if (clipData != null) { if (clipData.description.label == key) { if (clipData.itemCount == 1) { @@ -242,7 +242,7 @@ object UriUtil { } } } catch (e: Exception) { - return intent.getParcelableExtra(key) + return intent?.getParcelableExtra(key) } return null } diff --git a/app/src/main/java/com/kunzisoft/keepass/view/HardwareKeySelectionView.kt b/app/src/main/java/com/kunzisoft/keepass/view/HardwareKeySelectionView.kt index f7d6bd063..e223751c9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/HardwareKeySelectionView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/HardwareKeySelectionView.kt @@ -71,6 +71,11 @@ class HardwareKeySelectionView @JvmOverloads constructor(context: Context, hardwareKeyLayout = findViewById(R.id.input_entry_hardware_key_layout) hardwareKeyCompletion = findViewById(R.id.input_entry_hardware_key_completion) + hardwareKeyCompletion.isFocusable = false + hardwareKeyCompletion.isFocusableInTouchMode = false + //hardwareKeyCompletion.isEnabled = false + hardwareKeyCompletion.isCursorVisible = false + hardwareKeyCompletion.setTextIsSelectable(false) hardwareKeyCompletion.inputType = InputType.TYPE_NULL hardwareKeyCompletion.setAdapter(mHardwareKeyAdapter) @@ -89,8 +94,7 @@ class HardwareKeySelectionView @JvmOverloads constructor(context: Context, } set(value) { mHardwareKey = value - if (value != null) - hardwareKeyCompletion.setSelection(value.ordinal) + hardwareKeyCompletion.setText(value?.toString() ?: "") } var error: CharSequence? diff --git a/app/src/main/java/com/kunzisoft/keepass/view/MainCredentialView.kt b/app/src/main/java/com/kunzisoft/keepass/view/MainCredentialView.kt index 34a7f2786..325e18ba1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/MainCredentialView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/MainCredentialView.kt @@ -40,6 +40,7 @@ import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper import com.kunzisoft.keepass.activities.helpers.setOpenDocumentClickListener import com.kunzisoft.keepass.model.CredentialStorage import com.kunzisoft.keepass.database.element.MainCredential +import com.kunzisoft.keepass.hardware.HardwareKey class MainCredentialView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, @@ -156,6 +157,18 @@ class MainCredentialView @JvmOverloads constructor(context: Context, } } + fun populateHardwareKeyView(hardwareKey: HardwareKey?) { + if (hardwareKey == null) { + hardwareKeySelectionView.hardwareKey = null + if (checkboxHardwareView.isChecked) + checkboxHardwareView.isChecked = false + } else { + hardwareKeySelectionView.hardwareKey = hardwareKey + if (!checkboxHardwareView.isChecked) + checkboxHardwareView.isChecked = true + } + } + fun setOpenKeyfileClickListener(externalFileHelper: ExternalFileHelper?) { keyFileSelectionView.setOpenDocumentClickListener(externalFileHelper) } diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFilesViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFilesViewModel.kt index f1383f55d..0fafefbc6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFilesViewModel.kt +++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFilesViewModel.kt @@ -7,6 +7,7 @@ import androidx.lifecycle.MutableLiveData import com.kunzisoft.keepass.app.App import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction import com.kunzisoft.keepass.app.database.IOActionTask +import com.kunzisoft.keepass.hardware.HardwareKey import com.kunzisoft.keepass.model.DatabaseFile import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.utils.UriUtil @@ -72,8 +73,12 @@ class DatabaseFilesViewModel(application: Application) : AndroidViewModel(applic } } - fun addDatabaseFile(databaseUri: Uri, keyFileUri: Uri?) { - mFileDatabaseHistoryAction?.addOrUpdateDatabaseUri(databaseUri, keyFileUri) { databaseFileAdded -> + fun addDatabaseFile(databaseUri: Uri, keyFileUri: Uri?, hardwareKey: HardwareKey?) { + mFileDatabaseHistoryAction?.addOrUpdateDatabaseUri( + databaseUri, + keyFileUri, + hardwareKey + ) { databaseFileAdded -> databaseFileAdded?.let { _ -> databaseFilesLoaded.value = getDatabaseFilesLoadedValue().apply { this.databaseFileAction = DatabaseFileAction.ADD @@ -96,6 +101,7 @@ class DatabaseFilesViewModel(application: Application) : AndroidViewModel(applic .find { it.databaseUri == databaseFileUpdated.databaseUri } ?.apply { keyFileUri = databaseFileUpdated.keyFileUri + hardwareKey = databaseFileUpdated.hardwareKey databaseAlias = databaseFileUpdated.databaseAlias databaseFileExists = databaseFileUpdated.databaseFileExists databaseLastModified = databaseFileUpdated.databaseLastModified diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 4ffdf4fbf..6f9d79050 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -91,6 +91,8 @@ true remember_keyfile_locations_key true + remember_hardware_key_key + true advanced_unlock_explanation_key biometric_unlock_enable_key false diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83ad082fe..7b97e435f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -292,6 +292,8 @@ Keeps track of where databases are stored Remember keyfile locations Keeps track of where keyfiles are stored + Remember hardware keys + Keeps track of the hardware keys used Show recent files Show locations of recent databases Hide broken database links diff --git a/app/src/main/res/xml/preferences_application.xml b/app/src/main/res/xml/preferences_application.xml index 31b4180bd..6daa9f62d 100644 --- a/app/src/main/res/xml/preferences_application.xml +++ b/app/src/main/res/xml/preferences_application.xml @@ -17,8 +17,7 @@ You should have received a copy of the GNU General Public License along with KeePassDX. If not, see . --> - + @@ -107,6 +106,12 @@ android:summary="@string/remember_keyfile_locations_summary" android:dependency="@string/remember_database_locations_key" android:defaultValue="@bool/remember_keyfile_locations_default"/> +