From 8324acadc84f44f5e432edd5f93b27b2fd3a730c Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 23 Mar 2022 18:31:20 +0100 Subject: [PATCH] Toast when trying to open another database --- .../keepass/activities/MainCredentialActivity.kt | 10 ++++++++++ app/src/main/res/values/strings.xml | 1 + 2 files changed, 11 insertions(+) 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 090d87f9f..72b5d60ac 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt @@ -34,6 +34,7 @@ import android.view.ViewGroup import android.widget.Button import android.widget.CompoundButton import android.widget.TextView +import android.widget.Toast import androidx.activity.result.ActivityResultLauncher import androidx.activity.viewModels import androidx.annotation.RequiresApi @@ -235,6 +236,15 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu override fun onDatabaseRetrieved(database: Database?) { super.onDatabaseRetrieved(database) if (database != null) { + // Trying to load another database + if (mDatabaseFileUri != null + && database.fileUri != null + && mDatabaseFileUri != database.fileUri) { + Toast.makeText(this, + R.string.warning_database_already_opened, + Toast.LENGTH_LONG + ).show() + } launchGroupActivityIfLoaded(database) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f5d274b33..0827061c8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -331,6 +331,7 @@ Avoid password characters outside of text encoding format in database file (unrecognized chars are converted to the same letter). Grant file write access to save database changes Access to the file revoked by the file manager + A database is already open, close it first to open the new one Continue without password unlocking protection? Continue without encryption key? Permanently delete selected nodes?