Fix launch group activity when database loaded

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

@@ -50,6 +50,7 @@ import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.database.action.ProgressDialogThread
+import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
 import com.kunzisoft.keepass.utils.MenuUtil
@@ -232,6 +233,23 @@ class FileDatabaseSelectActivity : StylishActivity(),
                 })
     }
 
+    private fun launchGroupActivity(readOnly: Boolean) {
+        EntrySelectionHelper.doEntrySelectionAction(intent,
+                {
+                    GroupActivity.launch(this@FileDatabaseSelectActivity, readOnly)
+                },
+                {
+                    GroupActivity.launchForKeyboardSelection(this@FileDatabaseSelectActivity, readOnly)
+                    // Do not keep history
+                    finish()
+                },
+                { assistStructure ->
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        GroupActivity.launchForAutofillResult(this@FileDatabaseSelectActivity, assistStructure, readOnly)
+                    }
+                })
+    }
+
     private fun launchPasswordActivityWithPath(databaseUri: Uri) {
         launchPasswordActivity(databaseUri, null)
         // Delete flickering for kitkat <=
@@ -259,6 +277,11 @@ class FileDatabaseSelectActivity : StylishActivity(),
     }
 
     override fun onResume() {
+        val database = Database.getInstance()
+        if (database.loaded) {
+            launchGroupActivity(database.isReadOnly)
+        }
+
         super.onResume()
 
         updateExternalStorageWarning()

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

@@ -66,6 +66,7 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.KEY_FILE_KEY
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.MASTER_PASSWORD_KEY
+import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.READ_ONLY_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.FileDatabaseInfo
 import com.kunzisoft.keepass.utils.MenuUtil
@@ -177,12 +178,14 @@ class PasswordActivity : StylishActivity() {
                     var databaseUri: Uri? = null
                     var masterPassword: String? = null
                     var keyFileUri: Uri? = null
+                    var readOnly = true
                     var cipherEntity: CipherDatabaseEntity? = null
 
                     result.data?.let { resultData ->
                         databaseUri = resultData.getParcelable(DATABASE_URI_KEY)
                         masterPassword = resultData.getString(MASTER_PASSWORD_KEY)
                         keyFileUri = resultData.getParcelable(KEY_FILE_KEY)
+                        readOnly = resultData.getBoolean(READ_ONLY_KEY)
                         cipherEntity = resultData.getParcelable(CIPHER_ENTITY_KEY)
                     }
 
@@ -191,20 +194,7 @@ class PasswordActivity : StylishActivity() {
                         removePassword()
 
                         if (result.isSuccess) {
-                            EntrySelectionHelper.doEntrySelectionAction(intent,
-                                    {
-                                        GroupActivity.launch(this@PasswordActivity, readOnly)
-                                    },
-                                    {
-                                        GroupActivity.launchForKeyboardSelection(this@PasswordActivity, readOnly)
-                                        // Do not keep history
-                                        finish()
-                                    },
-                                    { assistStructure ->
-                                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                            GroupActivity.launchForAutofillResult(this@PasswordActivity, assistStructure, readOnly)
-                                        }
-                                    })
+                            launchGroupActivity()
                         } else {
                             var resultError = ""
                             val resultException = result.exception
@@ -218,6 +208,7 @@ class PasswordActivity : StylishActivity() {
                                                 databaseFileUri,
                                                 masterPassword,
                                                 keyFileUri,
+                                                readOnly,
                                                 cipherEntity,
                                                 true)
                                     }
@@ -239,6 +230,23 @@ class PasswordActivity : StylishActivity() {
         }
     }
 
+    private fun launchGroupActivity() {
+        EntrySelectionHelper.doEntrySelectionAction(intent,
+                {
+                    GroupActivity.launch(this@PasswordActivity, readOnly)
+                },
+                {
+                    GroupActivity.launchForKeyboardSelection(this@PasswordActivity, readOnly)
+                    // Do not keep history
+                    finish()
+                },
+                { assistStructure ->
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        GroupActivity.launchForAutofillResult(this@PasswordActivity, assistStructure, readOnly)
+                    }
+                })
+    }
+
     private val onEditorActionListener = object : TextView.OnEditorActionListener {
         override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean {
             if (actionId == IME_ACTION_DONE) {
@@ -250,6 +258,9 @@ class PasswordActivity : StylishActivity() {
     }
 
     override fun onResume() {
+        if (Database.getInstance().loaded)
+            launchGroupActivity()
+
         // If the database isn't accessible make sure to clear the password field, if it
         // was saved in the instance state
         if (Database.getInstance().loaded) {
@@ -510,6 +521,7 @@ class PasswordActivity : StylishActivity() {
                     databaseUri,
                     password,
                     keyFileUri,
+                    readOnly,
                     cipherDatabaseEntity,
                     false)
         }
@@ -518,12 +530,14 @@ class PasswordActivity : StylishActivity() {
     private fun showProgressDialogAndLoadDatabase(databaseUri: Uri,
                                                   password: String?,
                                                   keyFile: Uri?,
+                                                  readOnly: Boolean,
                                                   cipherDatabaseEntity: CipherDatabaseEntity?,
                                                   fixDuplicateUUID: Boolean) {
         progressDialogThread?.startDatabaseLoad(
                 databaseUri,
                 password,
                 keyFile,
+                readOnly,
                 cipherDatabaseEntity,
                 fixDuplicateUUID
         )

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

@@ -35,6 +35,7 @@ class LoadDatabaseRunnable(private val context: Context,
                            private val mUri: Uri,
                            private val mPass: String?,
                            private val mKey: Uri?,
+                           private val mReadonly: Boolean,
                            private val mCipherEntity: CipherDatabaseEntity?,
                            private val mOmitBackup: Boolean,
                            private val mFixDuplicateUUID: Boolean,
@@ -50,6 +51,7 @@ class LoadDatabaseRunnable(private val context: Context,
             mDatabase.closeAndClear(cacheDirectory)
 
             mDatabase.loadData(mUri, mPass, mKey,
+                    mReadonly,
                     context.contentResolver,
                     cacheDirectory,
                     mOmitBackup,

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

@@ -118,8 +118,6 @@ class ProgressDialogThread(private val activity: FragmentActivity,
     }
 
     fun registerProgressTask() {
-        ProgressTaskDialogFragment.stop(activity)
-
         // Register a database task receiver to stop loading dialog when service finish the task
         databaseTaskBroadcastReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
@@ -148,6 +146,8 @@ class ProgressDialogThread(private val activity: FragmentActivity,
     }
 
     fun unregisterProgressTask() {
+        ProgressTaskDialogFragment.stop(activity)
+
         mBinder?.removeActionTaskListener(actionTaskListener)
         mBinder = null
 
@@ -192,12 +192,14 @@ class ProgressDialogThread(private val activity: FragmentActivity,
     fun startDatabaseLoad(databaseUri: Uri,
                           masterPassword: String?,
                           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.KEY_FILE_KEY, keyFile)
+            putBoolean(DatabaseTaskNotificationService.READ_ONLY_KEY, readOnly)
             putParcelable(DatabaseTaskNotificationService.CIPHER_ENTITY_KEY, cipherEntity)
             putBoolean(DatabaseTaskNotificationService.FIX_DUPLICATE_UUID_KEY, fixDuplicateUuid)
         }

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

@@ -288,6 +288,7 @@ class Database {
 
     @Throws(LoadDatabaseException::class)
     fun loadData(uri: Uri, password: String?, keyfile: Uri?,
+                 readOnly: Boolean,
                  contentResolver: ContentResolver,
                  cacheDirectory: File,
                  omitBackup: Boolean,
@@ -295,7 +296,7 @@ class Database {
                  progressTaskUpdater: ProgressTaskUpdater?) {
 
         mUri = uri
-        isReadOnly = false
+        isReadOnly = readOnly
         if (uri.scheme == "file") {
             val file = File(uri.path!!)
             isReadOnly = !file.canWrite()

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

@@ -232,6 +232,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         if (intent.hasExtra(DATABASE_URI_KEY)
                 && intent.hasExtra(MASTER_PASSWORD_KEY)
                 && intent.hasExtra(KEY_FILE_KEY)
+                && intent.hasExtra(READ_ONLY_KEY)
                 && intent.hasExtra(CIPHER_ENTITY_KEY)
                 && intent.hasExtra(FIX_DUPLICATE_UUID_KEY)
         ) {
@@ -239,6 +240,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
             val databaseUri: Uri = intent.getParcelableExtra(DATABASE_URI_KEY)
             val masterPassword: String? = intent.getStringExtra(MASTER_PASSWORD_KEY)
             val keyFileUri: Uri? = intent.getParcelableExtra(KEY_FILE_KEY)
+            val readOnly: Boolean = intent.getBooleanExtra(READ_ONLY_KEY, true)
             val cipherEntity: CipherDatabaseEntity? = intent.getParcelableExtra(CIPHER_ENTITY_KEY)
 
             return LoadDatabaseRunnable(
@@ -247,6 +249,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                     databaseUri,
                     masterPassword,
                     keyFileUri,
+                    readOnly,
                     cipherEntity,
                     PreferencesUtil.omitBackup(this),
                     intent.getBooleanExtra(FIX_DUPLICATE_UUID_KEY, false),
@@ -257,6 +260,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
                                 putParcelable(DATABASE_URI_KEY, databaseUri)
                                 putString(MASTER_PASSWORD_KEY, masterPassword)
                                 putParcelable(KEY_FILE_KEY, keyFileUri)
+                                putBoolean(READ_ONLY_KEY, readOnly)
                                 putParcelable(CIPHER_ENTITY_KEY, cipherEntity)
                             }
                         }
@@ -483,6 +487,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat
         const val MASTER_PASSWORD_KEY = "MASTER_PASSWORD_KEY"
         const val KEY_FILE_CHECKED_KEY = "KEY_FILE_CHECKED_KEY"
         const val KEY_FILE_KEY = "KEY_FILE_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"
         const val GROUP_KEY = "GROUP_KEY"