Better main credential factorization

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

@@ -55,10 +55,10 @@ import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.KEY_FILE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.*
 import com.kunzisoft.keepass.view.asError
@@ -200,8 +200,8 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                 when (actionTask) {
                     ACTION_DATABASE_CREATE_TASK -> {
                         result.data?.getParcelable<Uri?>(DATABASE_URI_KEY)?.let { databaseUri ->
-                            val keyFileUri = result.data?.getParcelable<Uri?>(KEY_FILE_URI_KEY)
+                            val mainCredential = result.data?.getParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY) ?: MainCredential()
-                            databaseFilesViewModel.addDatabaseFile(databaseUri, keyFileUri)
+                            databaseFilesViewModel.addDatabaseFile(databaseUri, mainCredential.keyFileUri)
                         }
                     }
                     ACTION_DATABASE_LOAD_TASK -> {
@@ -339,8 +339,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(),
                 // Create the new database
                 mProgressDatabaseTaskProvider?.startDatabaseCreate(
                         databaseUri,
-                        mainCredential.masterPassword,
+                        mainCredential
-                        mainCredential.keyFile
                 )
             }
         } catch (e: Exception) {

app/src/main/java/com/kunzisoft/keepass/database/action/AssignPasswordInDatabaseRunnable.kt

@@ -24,14 +24,14 @@ import android.net.Uri
 import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.utils.UriUtil
 
 open class AssignPasswordInDatabaseRunnable (
         context: Context,
         database: Database,
         protected val mDatabaseUri: Uri,
-        protected val mMasterPassword: String?,
+        protected val mMainCredential: MainCredential)
-        protected val mKeyFileUri: Uri?)
     : SaveDatabaseRunnable(context, database, true) {
 
     private var mBackupKey: ByteArray? = null
@@ -43,8 +43,8 @@ open class AssignPasswordInDatabaseRunnable (
             mBackupKey = ByteArray(database.masterKey.size)
             System.arraycopy(database.masterKey, 0, mBackupKey!!, 0, mBackupKey!!.size)
 
-            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mKeyFileUri)
+            val uriInputStream = UriUtil.getUriInputStream(context.contentResolver, mMainCredential.keyFileUri)
-            database.retrieveMasterKey(mMasterPassword, uriInputStream)
+            database.retrieveMasterKey(mMainCredential.masterPassword, uriInputStream)
         } catch (e: Exception) {
             erase(mBackupKey)
             setError(e)

app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt

@@ -24,6 +24,7 @@ import android.net.Uri
 import android.util.Log
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
+import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.UriUtil
 
@@ -32,10 +33,9 @@ class CreateDatabaseRunnable(context: Context,
                              databaseUri: Uri,
                              private val databaseName: String,
                              private val rootName: String,
-                             masterPassword: String?,
+                             mainCredential: MainCredential,
-                             keyFile: Uri?,
                              private val createDatabaseResult: ((Result) -> Unit)?)
-    : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, masterPassword, keyFile) {
+    : AssignPasswordInDatabaseRunnable(context, mDatabase, databaseUri, mainCredential) {
 
     override fun onStartRun() {
         try {
@@ -59,7 +59,7 @@ class CreateDatabaseRunnable(context: Context,
             if (PreferencesUtil.rememberDatabaseLocations(context)) {
                 FileDatabaseHistoryAction.getInstance(context.applicationContext)
                         .addOrUpdateDatabaseUri(mDatabaseUri,
-                                if (PreferencesUtil.rememberKeyFileLocations(context)) mKeyFileUri else null)
+                                if (PreferencesUtil.rememberKeyFileLocations(context)) mMainCredential.keyFileUri else null)
             }
 
             // Register the current time to init the lock timer

app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt

@@ -25,8 +25,8 @@ import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 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.model.MainCredential
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
@@ -35,8 +35,7 @@ import com.kunzisoft.keepass.utils.UriUtil
 class LoadDatabaseRunnable(private val context: Context,
                            private val mDatabase: Database,
                            private val mUri: Uri,
-                           private val mPass: String?,
+                           private val mMainCredential: MainCredential,
-                           private val mKey: Uri?,
                            private val mReadonly: Boolean,
                            private val mCipherEntity: CipherDatabaseEntity?,
                            private val mFixDuplicateUUID: Boolean,
@@ -51,7 +50,8 @@ class LoadDatabaseRunnable(private val context: Context,
 
     override fun onActionRun() {
         try {
-            mDatabase.loadData(mUri, mPass, mKey,
+            mDatabase.loadData(mUri,
+                    mMainCredential,
                     mReadonly,
                     context.contentResolver,
                     UriUtil.getBinaryDir(context),
@@ -67,7 +67,7 @@ class LoadDatabaseRunnable(private val context: Context,
             if (PreferencesUtil.rememberDatabaseLocations(context)) {
                 FileDatabaseHistoryAction.getInstance(context)
                         .addOrUpdateDatabaseUri(mUri,
-                                if (PreferencesUtil.rememberKeyFileLocations(context)) mKey else null)
+                                if (PreferencesUtil.rememberKeyFileLocations(context)) mMainCredential.keyFileUri else null)
             }
 
             // Register the biometric

app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt

@@ -37,6 +37,7 @@ import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_ASSIGN_PASSWORD_TASK
@@ -264,26 +265,22 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
     */
 
     fun startDatabaseCreate(databaseUri: Uri,
-                            masterPassword: String?,
+                            mainCredential: MainCredential) {
-                            keyFile: Uri?) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
-            putString(DatabaseTaskNotificationService.MASTER_PASSWORD_KEY, masterPassword)
+            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
-            putParcelable(DatabaseTaskNotificationService.KEY_FILE_URI_KEY, keyFile)
         }
                 , ACTION_DATABASE_CREATE_TASK)
     }
 
     fun startDatabaseLoad(databaseUri: Uri,
-                          masterPassword: String?,
+                          mainCredential: MainCredential,
-                          keyFile: Uri?,
                           readOnly: Boolean,
                           cipherEntity: CipherDatabaseEntity?,
                           fixDuplicateUuid: Boolean) {
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
-            putString(DatabaseTaskNotificationService.MASTER_PASSWORD_KEY, masterPassword)
+            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
-            putParcelable(DatabaseTaskNotificationService.KEY_FILE_URI_KEY, keyFile)
             putBoolean(DatabaseTaskNotificationService.READ_ONLY_KEY, readOnly)
             putParcelable(DatabaseTaskNotificationService.CIPHER_ENTITY_KEY, cipherEntity)
             putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
@@ -299,13 +296,11 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
     }
 
     fun startDatabaseAssignPassword(databaseUri: Uri,
-                                    masterPassword: String?,
+                                    mainCredential: MainCredential) {
-                                    keyFile: Uri?) {
 
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
-            putString(DatabaseTaskNotificationService.MASTER_PASSWORD_KEY, masterPassword)
+            putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
-            putParcelable(DatabaseTaskNotificationService.KEY_FILE_URI_KEY, keyFile)
         }
                 , ACTION_DATABASE_ASSIGN_PASSWORD_TASK)
     }

app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt

@@ -41,6 +41,7 @@ import com.kunzisoft.keepass.database.file.output.DatabaseOutputKDBX
 import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.database.search.SearchParameters
 import com.kunzisoft.keepass.icons.IconDrawableFactory
+import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.stream.readBytes4ToUInt
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
 import com.kunzisoft.keepass.utils.SingletonHolder
@@ -374,7 +375,8 @@ class Database {
     }
 
     @Throws(LoadDatabaseException::class)
-    fun loadData(uri: Uri, password: String?, keyfile: Uri?,
+    fun loadData(uri: Uri,
+                 mainCredential: MainCredential,
                  readOnly: Boolean,
                  contentResolver: ContentResolver,
                  cacheDirectory: File,
@@ -391,8 +393,8 @@ class Database {
         var keyFileInputStream: InputStream? = null
         try {
             // Get keyFile inputStream
-            keyfile?.let {
+            mainCredential.keyFileUri?.let { keyFile ->
-                keyFileInputStream = UriUtil.getUriInputStream(contentResolver, keyfile)
+                keyFileInputStream = UriUtil.getUriInputStream(contentResolver, keyFile)
             }
 
             // Read database stream for the first time
@@ -400,7 +402,7 @@ class Database {
                     { databaseInputStream ->
                         DatabaseInputKDB(cacheDirectory)
                                 .openDatabase(databaseInputStream,
-                                        password,
+                                        mainCredential.masterPassword,
                                         keyFileInputStream,
                                         progressTaskUpdater,
                                         fixDuplicateUUID)
@@ -408,7 +410,7 @@ class Database {
                     { databaseInputStream ->
                         DatabaseInputKDBX(cacheDirectory)
                                 .openDatabase(databaseInputStream,
-                                        password,
+                                        mainCredential.masterPassword,
                                         keyFileInputStream,
                                         progressTaskUpdater,
                                         fixDuplicateUUID)
@@ -619,7 +621,9 @@ class Database {
         }
     }
 
-    fun validatePasswordEncoding(password: String?, containsKeyFile: Boolean): Boolean {
+    fun validatePasswordEncoding(mainCredential: MainCredential): Boolean {
+        val password = mainCredential.masterPassword
+        val containsKeyFile = mainCredential.keyFileUri != null
         return mDatabaseKDB?.validatePasswordEncoding(password, containsKeyFile)
                 ?: mDatabaseKDBX?.validatePasswordEncoding(password, containsKeyFile)
                 ?: false

app/src/main/java/com/kunzisoft/keepass/model/MainCredential.kt

@@ -4,7 +4,7 @@ import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
 
-data class MainCredential(var masterPassword: String? = null, var keyFile: Uri? = null): Parcelable {
+data class MainCredential(var masterPassword: String? = null, var keyFileUri: Uri? = null): Parcelable {
 
     constructor(parcel: Parcel) : this(
             parcel.readString(),
@@ -13,7 +13,7 @@ data class MainCredential(var masterPassword: String? = null, var keyFile: Uri?
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(masterPassword)
-        parcel.writeParcelable(keyFile, flags)
+        parcel.writeParcelable(keyFileUri, flags)
     }
 
     override fun describeContents(): Int {

app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt

@@ -39,6 +39,7 @@ import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.model.MainCredential
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
@@ -399,8 +400,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
         intent?.removeExtra(DATABASE_TASK_WARNING_KEY)
 
         intent?.removeExtra(DATABASE_URI_KEY)
-        intent?.removeExtra(MASTER_PASSWORD_KEY)
+        intent?.removeExtra(MAIN_CREDENTIAL_KEY)
-        intent?.removeExtra(KEY_FILE_URI_KEY)
         intent?.removeExtra(READ_ONLY_KEY)
         intent?.removeExtra(CIPHER_ENTITY_KEY)
         intent?.removeExtra(FIX_DUPLICATE_UUID_KEY)
@@ -472,11 +472,10 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
     private fun buildDatabaseCreateActionTask(intent: Intent): ActionRunnable? {
 
         if (intent.hasExtra(DATABASE_URI_KEY)
-                && intent.hasExtra(MASTER_PASSWORD_KEY)
+                && intent.hasExtra(MAIN_CREDENTIAL_KEY)
-                && intent.hasExtra(KEY_FILE_URI_KEY)
         ) {
             val databaseUri: Uri? = intent.getParcelableExtra(DATABASE_URI_KEY)
-            val keyFileUri: Uri? = intent.getParcelableExtra(KEY_FILE_URI_KEY)
+            val mainCredential: MainCredential = intent.getParcelableExtra(MAIN_CREDENTIAL_KEY) ?: MainCredential()
 
             if (databaseUri == null)
                 return null
@@ -486,12 +485,11 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                     databaseUri,
                     getString(R.string.database_default_name),
                     getString(R.string.database),
-                    intent.getStringExtra(MASTER_PASSWORD_KEY),
+                    mainCredential
-                    keyFileUri
             ) { result ->
                 result.data = Bundle().apply {
                     putParcelable(DATABASE_URI_KEY, databaseUri)
-                    putParcelable(KEY_FILE_URI_KEY, keyFileUri)
+                    putParcelable(MAIN_CREDENTIAL_KEY, mainCredential)
                 }
             }
         } else {
@@ -502,15 +500,13 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
     private fun buildDatabaseLoadActionTask(intent: Intent): ActionRunnable? {
 
         if (intent.hasExtra(DATABASE_URI_KEY)
-                && intent.hasExtra(MASTER_PASSWORD_KEY)
+                && intent.hasExtra(MAIN_CREDENTIAL_KEY)
-                && intent.hasExtra(KEY_FILE_URI_KEY)
                 && intent.hasExtra(READ_ONLY_KEY)
                 && intent.hasExtra(CIPHER_ENTITY_KEY)
                 && intent.hasExtra(FIX_DUPLICATE_UUID_KEY)
         ) {
             val databaseUri: Uri? = intent.getParcelableExtra(DATABASE_URI_KEY)
-            val masterPassword: String? = intent.getStringExtra(MASTER_PASSWORD_KEY)
+            val mainCredential: MainCredential = intent.getParcelableExtra(MAIN_CREDENTIAL_KEY) ?: MainCredential()
-            val keyFileUri: Uri? = intent.getParcelableExtra(KEY_FILE_URI_KEY)
             val readOnly: Boolean = intent.getBooleanExtra(READ_ONLY_KEY, true)
             val cipherEntity: CipherDatabaseEntity? = intent.getParcelableExtra(CIPHER_ENTITY_KEY)
 
@@ -521,8 +517,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                     this,
                     mDatabase,
                     databaseUri,
-                    masterPassword,
+                    mainCredential,
-                    keyFileUri,
                     readOnly,
                     cipherEntity,
                     intent.getBooleanExtra(FIX_DUPLICATE_UUID_KEY, false),
@@ -531,8 +526,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                 // Add each info to reload database after thrown duplicate UUID exception
                 result.data = Bundle().apply {
                     putParcelable(DATABASE_URI_KEY, databaseUri)
-                    putString(MASTER_PASSWORD_KEY, masterPassword)
+                    putParcelable(MAIN_CREDENTIAL_KEY, mainCredential)
-                    putParcelable(KEY_FILE_URI_KEY, keyFileUri)
                     putBoolean(READ_ONLY_KEY, readOnly)
                     putParcelable(CIPHER_ENTITY_KEY, cipherEntity)
                 }
@@ -555,15 +549,13 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
 
     private fun buildDatabaseAssignPasswordActionTask(intent: Intent): ActionRunnable? {
         return if (intent.hasExtra(DATABASE_URI_KEY)
-                && intent.hasExtra(MASTER_PASSWORD_KEY)
+                && intent.hasExtra(MAIN_CREDENTIAL_KEY)
-                && intent.hasExtra(KEY_FILE_URI_KEY)
         ) {
             val databaseUri: Uri = intent.getParcelableExtra(DATABASE_URI_KEY) ?: return null
             AssignPasswordInDatabaseRunnable(this,
                     mDatabase,
                     databaseUri,
-                    intent.getStringExtra(MASTER_PASSWORD_KEY),
+                    intent.getParcelableExtra(MAIN_CREDENTIAL_KEY) ?: MainCredential()
-                    intent.getParcelableExtra(KEY_FILE_URI_KEY)
             )
         } else {
             null
@@ -886,8 +878,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
         const val DATABASE_TASK_WARNING_KEY = "DATABASE_TASK_WARNING_KEY"
 
         const val DATABASE_URI_KEY = "DATABASE_URI_KEY"
-        const val MASTER_PASSWORD_KEY = "MASTER_PASSWORD_KEY"
+        const val MAIN_CREDENTIAL_KEY = "MAIN_CREDENTIAL_KEY"
-        const val KEY_FILE_URI_KEY = "KEY_FILE_URI_KEY"
         const val READ_ONLY_KEY = "READ_ONLY_KEY"
         const val CIPHER_ENTITY_KEY = "CIPHER_ENTITY_KEY"
         const val FIX_DUPLICATE_UUID_KEY = "FIX_DUPLICATE_UUID_KEY"

app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt

@@ -146,8 +146,7 @@ open class SettingsActivity
         databaseUri?.let {
             mProgressDatabaseTaskProvider?.startDatabaseAssignPassword(
                     databaseUri,
-                    mainCredential.masterPassword,
+                    mainCredential
-                    mainCredential.keyFile
             )
         }
     }
@@ -156,11 +155,10 @@ open class SettingsActivity
         Database.getInstance().let { database ->
             database.fileUri?.let { databaseUri ->
                 // Show the progress dialog now or after dialog confirmation
-                if (database.validatePasswordEncoding(mainCredential.masterPassword, mainCredential.keyFile != null)) {
+                if (database.validatePasswordEncoding(mainCredential)) {
                     mProgressDatabaseTaskProvider?.startDatabaseAssignPassword(
                             databaseUri,
-                            mainCredential.masterPassword,
+                            mainCredential
-                            mainCredential.keyFile
                     )
                 } else {
                     PasswordEncodingDialogFragment.getInstance(databaseUri, mainCredential)