From 9a5c782d5d6ee052fd739952e0dce3c799c61027 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 27 Oct 2025 20:45:40 +0100 Subject: [PATCH] fix: Small fix, info dialog --- .../com/kunzisoft/keepass/activities/EntryActivity.kt | 2 ++ .../kunzisoft/keepass/activities/EntryEditActivity.kt | 2 ++ .../keepass/activities/FileDatabaseSelectActivity.kt | 2 ++ .../com/kunzisoft/keepass/activities/GroupActivity.kt | 2 ++ .../kunzisoft/keepass/activities/IconPickerActivity.kt | 2 ++ .../keepass/activities/ImageViewerActivity.kt | 2 ++ .../keepass/activities/KeyGeneratorActivity.kt | 2 ++ .../keepass/activities/MainCredentialActivity.kt | 2 ++ .../activity/AutofillLauncherActivity.kt | 10 ++++------ .../activity/EntrySelectionLauncherActivity.kt | 2 ++ .../keepass/settings/ExternalSettingsActivity.kt | 2 ++ 11 files changed, 24 insertions(+), 6 deletions(-) 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 e061a27c2..dfd503f85 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt @@ -125,6 +125,8 @@ class EntryActivity : DatabaseLockActivity() { private var mBackgroundColor: Int? = null private var mForegroundColor: Int? = null + override fun manageDatabaseInfo(): Boolean = true + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) 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 9ac3e99b0..c3fe06deb 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -157,6 +157,8 @@ class EntryEditActivity : DatabaseLockActivity(), } } + override fun manageDatabaseInfo(): Boolean = true + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_entry_edit) 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 28cd408fe..28ed08fe2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -94,6 +94,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(), private var mExternalFileHelper: ExternalFileHelper? = null + override fun manageDatabaseInfo(): Boolean = false + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) 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 7bc23e553..0b37f2378 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -274,6 +274,8 @@ class GroupActivity : DatabaseLockActivity(), mGroupEditViewModel.selectIcon(icon) } + override fun manageDatabaseInfo(): Boolean = true + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt index 9ff62a512..2773089d6 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt @@ -78,6 +78,8 @@ class IconPickerActivity : DatabaseLockActivity() { private var mExternalFileHelper: ExternalFileHelper? = null + override fun manageDatabaseInfo(): Boolean = true + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt index af258b61d..e3c0b52d4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt @@ -45,6 +45,8 @@ class ImageViewerActivity : DatabaseLockActivity() { private lateinit var imageView: ImageView private lateinit var progressView: View + override fun manageDatabaseInfo(): Boolean = false + @SuppressLint("ClickableViewAccessibility") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt index 18c29b694..4c3ac31fb 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt @@ -28,6 +28,8 @@ class KeyGeneratorActivity : DatabaseLockActivity() { private lateinit var validationButton: View private var lockView: View? = null + override fun manageDatabaseInfo(): Boolean = true + private val keyGeneratorViewModel: KeyGeneratorViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { 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 63bba08eb..f88ed643d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt @@ -124,6 +124,8 @@ class MainCredentialActivity : DatabaseModeActivity() { private var mReadOnly: Boolean = false private var mForceReadOnly: Boolean = false + override fun manageDatabaseInfo(): Boolean = false + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/AutofillLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/AutofillLauncherActivity.kt index 2e02fbf8f..8702a75a7 100644 --- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/AutofillLauncherActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/AutofillLauncherActivity.kt @@ -70,13 +70,11 @@ class AutofillLauncherActivity : DatabaseModeActivity() { autofillLauncherViewModel.manageRegistrationResult(it) } - override fun applyCustomStyle(): Boolean { - return false - } + override fun applyCustomStyle(): Boolean = false - override fun finishActivityIfReloadRequested(): Boolean { - return true - } + override fun finishActivityIfReloadRequested(): Boolean = true + + override fun manageDatabaseInfo(): Boolean = false override fun onCreate(savedInstanceState: Bundle?) { // To apply the bypass https://github.com/Kunzisoft/KeePassDX/issues/2238 diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/EntrySelectionLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/EntrySelectionLauncherActivity.kt index 561d64184..448338dad 100644 --- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/EntrySelectionLauncherActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/EntrySelectionLauncherActivity.kt @@ -56,6 +56,8 @@ class EntrySelectionLauncherActivity : DatabaseModeActivity() { override fun finishActivityIfReloadRequested() = false + override fun manageDatabaseInfo(): Boolean = false + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) entrySelectionViewModel.initialize() diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/ExternalSettingsActivity.kt b/app/src/main/java/com/kunzisoft/keepass/settings/ExternalSettingsActivity.kt index 68dfee71d..21daad42c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/ExternalSettingsActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/ExternalSettingsActivity.kt @@ -13,6 +13,8 @@ abstract class ExternalSettingsActivity : DatabaseModeActivity() { private var lockView: FloatingActionButton? = null + override fun manageDatabaseInfo(): Boolean = true + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState)