diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt index ef526b953..68b615e4e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt @@ -53,6 +53,7 @@ import com.kunzisoft.keepass.model.StreamDirection import com.kunzisoft.keepass.notifications.AttachmentFileNotificationService import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager @@ -151,6 +152,10 @@ class EntryActivity : LockingActivity() { if (result.isSuccess) finish() } + ACTION_DATABASE_RELOAD_TASK -> { + // Close the current activity + finish() + } } coordinatorLayout?.showActionError(result) } @@ -501,6 +506,9 @@ class EntryActivity : LockingActivity() { R.id.menu_save_database -> { mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly) } + R.id.menu_reload_database -> { + mProgressDatabaseTaskProvider?.startDatabaseReload(false) + } android.R.id.home -> finish() // close this activity and return to preview activity (if there is any) } return super.onOptionsItemSelected(item) 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 5134f1ffb..9343318b2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -61,6 +61,7 @@ import com.kunzisoft.keepass.notifications.AttachmentFileNotificationService import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_ENTRY_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK import com.kunzisoft.keepass.notifications.KeyboardEntryNotificationService import com.kunzisoft.keepass.otp.OtpElement @@ -335,6 +336,10 @@ class EntryEditActivity : LockingActivity(), Log.e(TAG, "Unable to retrieve entry after database action", e) } } + ACTION_DATABASE_RELOAD_TASK -> { + // Close the current activity + finish() + } } coordinatorLayout?.showActionError(result) } @@ -610,13 +615,7 @@ class EntryEditActivity : LockingActivity(), override fun onCreateOptionsMenu(menu: Menu): Boolean { super.onCreateOptionsMenu(menu) - - val inflater = menuInflater - inflater.inflate(R.menu.database, menu) - // Save database not needed here - menu.findItem(R.id.menu_save_database)?.isVisible = false - MenuUtil.contributionMenuInflater(inflater, menu) - + MenuUtil.contributionMenuInflater(menuInflater, menu) return true } @@ -673,9 +672,6 @@ class EntryEditActivity : LockingActivity(), override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.menu_save_database -> { - mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly) - } R.id.menu_contribute -> { MenuUtil.onContributionItemSelected(this) return true 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 28fa61cb8..98e223b54 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -70,6 +70,7 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_GROUP_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_GROUP_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.NEW_NODES_KEY @@ -342,6 +343,11 @@ class GroupActivity : LockingActivity(), } } } + ACTION_DATABASE_RELOAD_TASK -> { + // Reload the current activity + startActivity(intent) + finish() + } } coordinatorLayout?.showActionError(result) @@ -1003,6 +1009,10 @@ class GroupActivity : LockingActivity(), mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly) return true } + R.id.menu_reload_database -> { + mProgressDatabaseTaskProvider?.startDatabaseReload(false) + return true + } R.id.menu_empty_recycle_bin -> { mCurrentGroup?.getChildren()?.let { listChildren -> // Automatically delete all elements 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 b2b491638..10372b4cc 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt @@ -720,7 +720,7 @@ open class PasswordActivity : SpecialModeActivity(), AdvancedUnlockFragment.Buil when (resultCode) { LockingActivity.RESULT_EXIT_LOCK -> { clearCredentialsViews() - Database.getInstance().closeAndClear(UriUtil.getBinaryDir(this)) + Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this)) } Activity.RESULT_CANCELED -> { clearCredentialsViews() diff --git a/app/src/main/java/com/kunzisoft/keepass/app/App.kt b/app/src/main/java/com/kunzisoft/keepass/app/App.kt index 8094648b6..5207b1e51 100644 --- a/app/src/main/java/com/kunzisoft/keepass/app/App.kt +++ b/app/src/main/java/com/kunzisoft/keepass/app/App.kt @@ -34,7 +34,7 @@ class App : MultiDexApplication() { } override fun onTerminate() { - Database.getInstance().closeAndClear(UriUtil.getBinaryDir(this)) + Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this)) super.onTerminate() } } 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 7b7f90d0b..f2763f30a 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 @@ -26,7 +26,6 @@ import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.utils.UriUtil -import com.kunzisoft.keepass.utils.closeDatabase class CreateDatabaseRunnable(context: Context, private val mDatabase: Database, @@ -47,7 +46,7 @@ class CreateDatabaseRunnable(context: Context, createData(mDatabaseUri, databaseName, rootName) } } catch (e: Exception) { - mDatabase.closeAndClear(UriUtil.getBinaryDir(context)) + mDatabase.clearAndClose(UriUtil.getBinaryDir(context)) setError(e) } 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 5f9d0ce04..fe1ce2090 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 @@ -31,7 +31,6 @@ import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.tasks.ActionRunnable import com.kunzisoft.keepass.tasks.ProgressTaskUpdater import com.kunzisoft.keepass.utils.UriUtil -import com.kunzisoft.keepass.utils.closeDatabase class LoadDatabaseRunnable(private val context: Context, private val mDatabase: Database, @@ -47,7 +46,7 @@ class LoadDatabaseRunnable(private val context: Context, override fun onStartRun() { // Clear before we load - mDatabase.closeAndClear(UriUtil.getBinaryDir(context)) + mDatabase.clearAndClose(UriUtil.getBinaryDir(context)) } override fun onActionRun() { @@ -83,7 +82,7 @@ class LoadDatabaseRunnable(private val context: Context, // Register the current time to init the lock timer PreferencesUtil.saveCurrentTime(context) } else { - mDatabase.closeAndClear(UriUtil.getBinaryDir(context)) + mDatabase.clearAndClose(UriUtil.getBinaryDir(context)) } } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt index 221683bbe..534067403 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt @@ -47,6 +47,7 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_ENTRY_HISTORY import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RESTORE_ENTRY_HISTORY @@ -294,6 +295,13 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) { , ACTION_DATABASE_LOAD_TASK) } + fun startDatabaseReload(fixDuplicateUuid: Boolean) { + start(Bundle().apply { + putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid) + } + , ACTION_DATABASE_RELOAD_TASK) + } + fun startDatabaseAssignPassword(databaseUri: Uri, masterPasswordChecked: Boolean, masterPassword: String?, diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt new file mode 100644 index 000000000..1facff6af --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt @@ -0,0 +1,68 @@ +/* + * Copyright 2019 Jeremy Jamet / Kunzisoft. + * + * This file is part of KeePassDX. + * + * KeePassDX is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * KeePassDX is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with KeePassDX. If not, see . + * + */ +package com.kunzisoft.keepass.database.action + +import android.content.Context +import com.kunzisoft.keepass.database.element.Database +import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException +import com.kunzisoft.keepass.database.exception.LoadDatabaseException +import com.kunzisoft.keepass.settings.PreferencesUtil +import com.kunzisoft.keepass.tasks.ActionRunnable +import com.kunzisoft.keepass.tasks.ProgressTaskUpdater +import com.kunzisoft.keepass.utils.UriUtil + +class ReloadDatabaseRunnable(private val context: Context, + private val mDatabase: Database, + private val mFixDuplicateUUID: Boolean, + private val progressTaskUpdater: ProgressTaskUpdater?, + private val mLoadDatabaseResult: ((Result) -> Unit)?) + : ActionRunnable() { + + override fun onStartRun() { + // Clear before we load + mDatabase.clear(UriUtil.getBinaryDir(context)) + } + + override fun onActionRun() { + try { + mDatabase.reloadData(context.contentResolver, + UriUtil.getBinaryDir(context), + mFixDuplicateUUID, + progressTaskUpdater) + } + catch (e: DuplicateUuidDatabaseException) { + setError(e) + } + catch (e: LoadDatabaseException) { + setError(e) + } + + if (result.isSuccess) { + // Register the current time to init the lock timer + PreferencesUtil.saveCurrentTime(context) + } else { + mDatabase.clearAndClose(UriUtil.getBinaryDir(context)) + } + } + + override fun onFinishRun() { + mLoadDatabaseResult?.invoke(result) + } +} diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt index 444b86ba6..45d9f36c4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt @@ -31,10 +31,7 @@ import com.kunzisoft.keepass.database.element.node.NodeId import com.kunzisoft.keepass.database.element.node.NodeIdInt import com.kunzisoft.keepass.database.element.node.NodeIdUUID import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm -import com.kunzisoft.keepass.database.exception.DatabaseOutputException -import com.kunzisoft.keepass.database.exception.FileNotFoundDatabaseException -import com.kunzisoft.keepass.database.exception.LoadDatabaseException -import com.kunzisoft.keepass.database.exception.SignatureDatabaseException +import com.kunzisoft.keepass.database.exception.* import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX import com.kunzisoft.keepass.database.file.input.DatabaseInputKDB @@ -330,29 +327,11 @@ class Database { } @Throws(LoadDatabaseException::class) - fun loadData(uri: Uri, password: String?, keyfile: Uri?, - readOnly: Boolean, - contentResolver: ContentResolver, - cacheDirectory: File, - fixDuplicateUUID: Boolean, - progressTaskUpdater: ProgressTaskUpdater?) { - - this.fileUri = uri - isReadOnly = readOnly - if (uri.scheme == "file") { - val file = File(uri.path!!) - isReadOnly = !file.canWrite() - } - - // Pass KeyFile Uri as InputStreams + private fun readDatabaseStream(contentResolver: ContentResolver, uri: Uri, + openDatabaseKDB: (InputStream) -> DatabaseKDB, + openDatabaseKDBX: (InputStream) -> DatabaseKDBX) { var databaseInputStream: InputStream? = null - var keyFileInputStream: InputStream? = null try { - // Get keyFile inputStream - keyfile?.let { - keyFileInputStream = UriUtil.getUriInputStream(contentResolver, keyfile) - } - // Load Data, pass Uris as InputStreams val databaseStream = UriUtil.getUriInputStream(contentResolver, uri) ?: throw IOException("Database input stream cannot be retrieve") @@ -374,22 +353,10 @@ class Database { when { // Header of database KDB - DatabaseHeaderKDB.matchesHeader(sig1, sig2) -> setDatabaseKDB(DatabaseInputKDB( - cacheDirectory, - fixDuplicateUUID) - .openDatabase(databaseInputStream, - password, - keyFileInputStream, - progressTaskUpdater)) + DatabaseHeaderKDB.matchesHeader(sig1, sig2) -> setDatabaseKDB(openDatabaseKDB(databaseInputStream)) // Header of database KDBX - DatabaseHeaderKDBX.matchesHeader(sig1, sig2) -> setDatabaseKDBX(DatabaseInputKDBX( - cacheDirectory, - fixDuplicateUUID) - .openDatabase(databaseInputStream, - password, - keyFileInputStream, - progressTaskUpdater)) + DatabaseHeaderKDBX.matchesHeader(sig1, sig2) -> setDatabaseKDBX(openDatabaseKDBX(databaseInputStream)) // Header not recognized else -> throw SignatureDatabaseException() @@ -397,17 +364,92 @@ class Database { this.mSearchHelper = SearchHelper() loaded = true - } catch (e: LoadDatabaseException) { throw e + } finally { + databaseInputStream?.close() + } + } + + @Throws(LoadDatabaseException::class) + fun loadData(uri: Uri, password: String?, keyfile: Uri?, + readOnly: Boolean, + contentResolver: ContentResolver, + cacheDirectory: File, + fixDuplicateUUID: Boolean, + progressTaskUpdater: ProgressTaskUpdater?) { + + // Save database URI + this.fileUri = uri + + // Check if the file is writable + this.isReadOnly = readOnly + if (uri.scheme == "file") { + val file = File(uri.path!!) + isReadOnly = !file.canWrite() + } + + // Pass KeyFile Uri as InputStreams + var keyFileInputStream: InputStream? = null + try { + // Get keyFile inputStream + keyfile?.let { + keyFileInputStream = UriUtil.getUriInputStream(contentResolver, keyfile) + } + + // Read database stream for the first time + readDatabaseStream(contentResolver, uri, + { databaseInputStream -> + DatabaseInputKDB(cacheDirectory) + .openDatabase(databaseInputStream, + password, + keyFileInputStream, + fixDuplicateUUID, + progressTaskUpdater) + }, + { databaseInputStream -> + DatabaseInputKDBX(cacheDirectory) + .openDatabase(databaseInputStream, + password, + keyFileInputStream, + fixDuplicateUUID, + progressTaskUpdater) + } + ) } catch (e: Exception) { throw FileNotFoundDatabaseException() } finally { keyFileInputStream?.close() - databaseInputStream?.close() } } + @Throws(LoadDatabaseException::class) + fun reloadData(contentResolver: ContentResolver, + cacheDirectory: File, + fixDuplicateUUID: Boolean, + progressTaskUpdater: ProgressTaskUpdater?) { + + // Retrieve the stream from the old database URI + fileUri?.let { oldDatabaseUri -> + readDatabaseStream(contentResolver, oldDatabaseUri, + { databaseInputStream -> + DatabaseInputKDB(cacheDirectory) + .openDatabase(databaseInputStream, + masterKey, + fixDuplicateUUID, + progressTaskUpdater) + }, + { databaseInputStream -> + DatabaseInputKDBX(cacheDirectory) + .openDatabase(databaseInputStream, + masterKey, + fixDuplicateUUID, + progressTaskUpdater) + } + ) + } ?: throw IODatabaseException() + } + fun isGroupSearchable(group: Group, omitBackup: Boolean): Boolean { return mDatabaseKDB?.isGroupSearchable(group.groupKDB, omitBackup) ?: mDatabaseKDBX?.isGroupSearchable(group.groupKDBX, omitBackup) ?: @@ -531,7 +573,7 @@ class Database { this.fileUri = uri } - fun closeAndClear(filesDirectory: File? = null) { + fun clear(filesDirectory: File? = null) { drawFactory.clearCache() // Delete the cache of the database if present mDatabaseKDB?.clearCache() @@ -544,7 +586,10 @@ class Database { } catch (e: Exception) { Log.e(TAG, "Unable to clear the directory cache.", e) } + } + fun clearAndClose(filesDirectory: File? = null) { + clear(filesDirectory) this.mDatabaseKDB = null this.mDatabaseKDBX = null this.fileUri = null diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt index 8da334872..889efac64 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt @@ -41,6 +41,13 @@ abstract class DatabaseInput> abstract fun openDatabase(databaseInputStream: InputStream, password: String?, keyInputStream: InputStream?, + fixDuplicateUUID: Boolean, progressTaskUpdater: ProgressTaskUpdater?): PwDb + + @Throws(LoadDatabaseException::class) + abstract fun openDatabase(databaseInputStream: InputStream, + masterKey: ByteArray, + fixDuplicateUUID: Boolean, + progressTaskUpdater: ProgressTaskUpdater?): PwDb } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt index dd5ac5b6b..ca7d2413c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt @@ -45,8 +45,7 @@ import javax.crypto.spec.SecretKeySpec /** * Load a KDB database file. */ -class DatabaseInputKDB(cacheDirectory: File, - private val fixDuplicateUUID: Boolean = false) +class DatabaseInputKDB(cacheDirectory: File) : DatabaseInput(cacheDirectory) { private lateinit var mDatabaseToOpen: DatabaseKDB @@ -55,7 +54,28 @@ class DatabaseInputKDB(cacheDirectory: File, override fun openDatabase(databaseInputStream: InputStream, password: String?, keyInputStream: InputStream?, + fixDuplicateUUID: Boolean, progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDB { + return openDatabase(databaseInputStream, fixDuplicateUUID, progressTaskUpdater) { + mDatabaseToOpen.retrieveMasterKey(password, keyInputStream) + } + } + + @Throws(LoadDatabaseException::class) + override fun openDatabase(databaseInputStream: InputStream, + masterKey: ByteArray, + fixDuplicateUUID: Boolean, + progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDB { + return openDatabase(databaseInputStream, fixDuplicateUUID, progressTaskUpdater) { + mDatabaseToOpen.masterKey = masterKey + } + } + + @Throws(LoadDatabaseException::class) + private fun openDatabase(databaseInputStream: InputStream, + fixDuplicateUUID: Boolean, + progressTaskUpdater: ProgressTaskUpdater?, + assignMasterKey: (() -> Unit)? = null): DatabaseKDB { try { // Load entire file, most of it's encrypted. @@ -84,7 +104,7 @@ class DatabaseInputKDB(cacheDirectory: File, mDatabaseToOpen = DatabaseKDB() mDatabaseToOpen.changeDuplicateId = fixDuplicateUUID - mDatabaseToOpen.retrieveMasterKey(password, keyInputStream) + assignMasterKey?.invoke() // Select algorithm when { diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt index b7dee66c1..553cb9c1f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt @@ -63,8 +63,7 @@ import javax.crypto.Cipher import javax.crypto.CipherInputStream import kotlin.math.min -class DatabaseInputKDBX(cacheDirectory: File, - private val fixDuplicateUUID: Boolean = false) +class DatabaseInputKDBX(cacheDirectory: File) : DatabaseInput(cacheDirectory) { private var randomStream: StreamCipher? = null @@ -98,12 +97,30 @@ class DatabaseInputKDBX(cacheDirectory: File, override fun openDatabase(databaseInputStream: InputStream, password: String?, keyInputStream: InputStream?, + fixDuplicateUUID: Boolean, progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDBX { + return openDatabase(databaseInputStream, fixDuplicateUUID, progressTaskUpdater) { header -> + mDatabase.retrieveMasterKey(password, keyInputStream) + } + } + @Throws(LoadDatabaseException::class) + override fun openDatabase(databaseInputStream: InputStream, + masterKey: ByteArray, + fixDuplicateUUID: Boolean, + progressTaskUpdater: ProgressTaskUpdater?): DatabaseKDBX { + return openDatabase(databaseInputStream, fixDuplicateUUID, progressTaskUpdater) { + mDatabase.masterKey = masterKey + } + } + + @Throws(LoadDatabaseException::class) + private fun openDatabase(databaseInputStream: InputStream, + fixDuplicateUUID: Boolean, + progressTaskUpdater: ProgressTaskUpdater?, + assignMasterKey: ((header: DatabaseHeaderKDBX) -> Unit)? = null): DatabaseKDBX { try { - // TODO performance progressTaskUpdater?.updateMessage(R.string.retrieving_db_key) - mDatabase = DatabaseKDBX() mDatabase.changeDuplicateId = fixDuplicateUUID @@ -116,9 +133,8 @@ class DatabaseInputKDBX(cacheDirectory: File, hashOfHeader = headerAndHash.hash val pbHeader = headerAndHash.header - mDatabase.retrieveMasterKey(password, keyInputStream) + assignMasterKey?.invoke(header) mDatabase.makeFinalKey(header.masterSeed) - // TODO performance progressTaskUpdater?.updateMessage(R.string.decrypting_db) val engine: CipherEngine diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt index 7cef3ca06..7c66dc450 100644 --- a/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt @@ -180,6 +180,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress val actionRunnable: ActionRunnable? = when (intentAction) { ACTION_DATABASE_CREATE_TASK -> buildDatabaseCreateActionTask(intent) ACTION_DATABASE_LOAD_TASK -> buildDatabaseLoadActionTask(intent) + ACTION_DATABASE_RELOAD_TASK -> buildDatabaseReloadActionTask(intent) ACTION_DATABASE_ASSIGN_PASSWORD_TASK -> buildDatabaseAssignPasswordActionTask(intent) ACTION_DATABASE_CREATE_GROUP_TASK -> buildDatabaseCreateGroupActionTask(intent) ACTION_DATABASE_UPDATE_GROUP_TASK -> buildDatabaseUpdateGroupActionTask(intent) @@ -258,7 +259,9 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress } return when (intentAction) { - ACTION_DATABASE_LOAD_TASK, null -> { + ACTION_DATABASE_LOAD_TASK, + ACTION_DATABASE_RELOAD_TASK, + null -> { START_STICKY } else -> { @@ -292,7 +295,8 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress else -> { when (intentAction) { ACTION_DATABASE_CREATE_TASK -> R.string.creating_database - ACTION_DATABASE_LOAD_TASK -> R.string.loading_database + ACTION_DATABASE_LOAD_TASK, + ACTION_DATABASE_RELOAD_TASK -> R.string.loading_database ACTION_DATABASE_SAVE -> R.string.saving_database else -> { R.string.command_execution @@ -302,13 +306,15 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress } mMessageId = when (intentAction) { - ACTION_DATABASE_LOAD_TASK -> null + ACTION_DATABASE_LOAD_TASK, + ACTION_DATABASE_RELOAD_TASK -> null else -> null } mWarningId = if (!saveAction - || intentAction == ACTION_DATABASE_LOAD_TASK) + || intentAction == ACTION_DATABASE_LOAD_TASK + || intentAction == ACTION_DATABASE_RELOAD_TASK) null else R.string.do_not_kill_app @@ -509,6 +515,23 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress } } + private fun buildDatabaseReloadActionTask(intent: Intent): ActionRunnable? { + + return if (intent.hasExtra(FIX_DUPLICATE_UUID_KEY)) { + ReloadDatabaseRunnable( + this, + mDatabase, + intent.getBooleanExtra(FIX_DUPLICATE_UUID_KEY, false), + this + ) { result -> + // No need to add each info to reload database + result.data = Bundle() + } + } else { + null + } + } + private fun buildDatabaseAssignPasswordActionTask(intent: Intent): ActionRunnable? { return if (intent.hasExtra(DATABASE_URI_KEY) && intent.hasExtra(MASTER_PASSWORD_CHECKED_KEY) @@ -814,6 +837,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress const val ACTION_DATABASE_CREATE_TASK = "ACTION_DATABASE_CREATE_TASK" const val ACTION_DATABASE_LOAD_TASK = "ACTION_DATABASE_LOAD_TASK" + const val ACTION_DATABASE_RELOAD_TASK = "ACTION_DATABASE_RELOAD_TASK" const val ACTION_DATABASE_ASSIGN_PASSWORD_TASK = "ACTION_DATABASE_ASSIGN_PASSWORD_TASK" const val ACTION_DATABASE_CREATE_GROUP_TASK = "ACTION_DATABASE_CREATE_GROUP_TASK" const val ACTION_DATABASE_UPDATE_GROUP_TASK = "ACTION_DATABASE_UPDATE_GROUP_TASK" diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt index de0bbadda..7fedcd403 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt @@ -552,6 +552,10 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() { settingActivity?.mProgressDatabaseTaskProvider?.startDatabaseSave(!mDatabaseReadOnly) true } + R.id.menu_reload_database -> { + settingActivity?.mProgressDatabaseTaskProvider?.startDatabaseReload(false) + return true + } else -> { // Check the time lock before launching settings diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt index 4418e86f7..138e13c20 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt @@ -37,6 +37,7 @@ import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper import com.kunzisoft.keepass.activities.lock.LockingActivity import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged import com.kunzisoft.keepass.database.element.Database +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService import com.kunzisoft.keepass.timeout.TimeoutHelper import com.kunzisoft.keepass.view.showActionError @@ -95,12 +96,19 @@ open class SettingsActivity backupManager = BackupManager(this) mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result -> - // Call result in fragment - (supportFragmentManager - .findFragmentByTag(TAG_NESTED) as NestedSettingsFragment?) - ?.onProgressDialogThreadResult(actionTask, result) - - coordinatorLayout?.showActionError(result) + when (actionTask) { + DatabaseTaskNotificationService.ACTION_DATABASE_RELOAD_TASK -> { + // Close the current activity + finish() + } + else -> { + // Call result in fragment + (supportFragmentManager + .findFragmentByTag(TAG_NESTED) as NestedSettingsFragment?) + ?.onProgressDialogThreadResult(actionTask, result) + coordinatorLayout?.showActionError(result) + } + } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt b/app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt index 59c97ac7c..3dcfcf7b4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt +++ b/app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt @@ -138,5 +138,5 @@ fun Context.closeDatabase() { cancelAll() } // Clear data - Database.getInstance().closeAndClear(UriUtil.getBinaryDir(this)) + Database.getInstance().clearAndClose(UriUtil.getBinaryDir(this)) } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_reload_white_24dp.xml b/app/src/main/res/drawable/ic_reload_white_24dp.xml new file mode 100644 index 000000000..020472b89 --- /dev/null +++ b/app/src/main/res/drawable/ic_reload_white_24dp.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/menu/contribution.xml b/app/src/main/res/menu/contribution.xml index b76875ff9..5c1671456 100644 --- a/app/src/main/res/menu/contribution.xml +++ b/app/src/main/res/menu/contribution.xml @@ -22,6 +22,6 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/database.xml b/app/src/main/res/menu/database.xml index d94f86817..a7a182b8a 100644 --- a/app/src/main/res/menu/database.xml +++ b/app/src/main/res/menu/database.xml @@ -24,4 +24,9 @@ android:title="@string/menu_save_database" android:orderInCategory="95" app:showAsAction="ifRoom" /> + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3216006e2..af96c532d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -185,6 +185,7 @@ Hide password Lock database Save database + Reload database Open Search Show password