mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Compare commits
2 Commits
9ddd66ce85
...
5bdc72aa67
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5bdc72aa67 | ||
|
|
2be32e6884 |
@@ -1,3 +1,6 @@
|
|||||||
|
KeePassDX(4.2.4)
|
||||||
|
* Fix remembering database location #2262
|
||||||
|
|
||||||
KeePassDX(4.2.3)
|
KeePassDX(4.2.3)
|
||||||
* Fix multiple Passkey selection #2253
|
* Fix multiple Passkey selection #2253
|
||||||
* Fix database dialog subtitle #2254
|
* Fix database dialog subtitle #2254
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId "com.kunzisoft.keepass"
|
applicationId "com.kunzisoft.keepass"
|
||||||
minSdkVersion 19
|
minSdkVersion 19
|
||||||
targetSdkVersion 35
|
targetSdkVersion 35
|
||||||
versionCode = 148
|
versionCode = 149
|
||||||
versionName = "4.2.3"
|
versionName = "4.2.4"
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
|
|
||||||
testApplicationId = "com.kunzisoft.keepass.tests"
|
testApplicationId = "com.kunzisoft.keepass.tests"
|
||||||
|
|||||||
@@ -55,10 +55,8 @@ import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
|
|||||||
import com.kunzisoft.keepass.hardware.HardwareKey
|
import com.kunzisoft.keepass.hardware.HardwareKey
|
||||||
import com.kunzisoft.keepass.model.RegisterInfo
|
import com.kunzisoft.keepass.model.RegisterInfo
|
||||||
import com.kunzisoft.keepass.model.SearchInfo
|
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_CREATE_TASK
|
||||||
import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_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.settings.PreferencesUtil
|
import com.kunzisoft.keepass.settings.PreferencesUtil
|
||||||
import com.kunzisoft.keepass.tasks.ActionRunnable
|
import com.kunzisoft.keepass.tasks.ActionRunnable
|
||||||
import com.kunzisoft.keepass.utils.AppUtil.isContributingUser
|
import com.kunzisoft.keepass.utils.AppUtil.isContributingUser
|
||||||
@@ -216,6 +214,12 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
|
|||||||
// Retrieve settings for default database
|
// Retrieve settings for default database
|
||||||
mAdapterDatabaseHistory?.setDefaultDatabase(it)
|
mAdapterDatabaseHistory?.setDefaultDatabase(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remove all the remember locations if needed
|
||||||
|
if (PreferencesUtil.rememberDatabaseLocations(applicationContext).not()) {
|
||||||
|
FileDatabaseHistoryAction.getInstance(applicationContext)
|
||||||
|
.deleteAll()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDatabaseRetrieved(database: ContextualDatabase) {
|
override fun onDatabaseRetrieved(database: ContextualDatabase) {
|
||||||
@@ -228,22 +232,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
|
|||||||
result: ActionRunnable.Result
|
result: ActionRunnable.Result
|
||||||
) {
|
) {
|
||||||
if (result.isSuccess) {
|
if (result.isSuccess) {
|
||||||
// Update list
|
|
||||||
when (actionTask) {
|
|
||||||
ACTION_DATABASE_CREATE_TASK,
|
|
||||||
ACTION_DATABASE_LOAD_TASK -> {
|
|
||||||
result.data?.getParcelableCompat<Uri>(DATABASE_URI_KEY)?.let { databaseUri ->
|
|
||||||
val mainCredential =
|
|
||||||
result.data?.getParcelableCompat(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY)
|
|
||||||
?: MainCredential()
|
|
||||||
databaseFilesViewModel.addDatabaseFile(
|
|
||||||
databaseUri,
|
|
||||||
mainCredential.keyFileUri,
|
|
||||||
mainCredential.hardwareKey
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Launch activity
|
// Launch activity
|
||||||
when (actionTask) {
|
when (actionTask) {
|
||||||
ACTION_DATABASE_CREATE_TASK -> {
|
ACTION_DATABASE_CREATE_TASK -> {
|
||||||
|
|||||||
1
fastlane/metadata/android/en-US/changelogs/149.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/149.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
* Fix remembering database location #2262
|
||||||
1
fastlane/metadata/android/fr-FR/changelogs/149.txt
Normal file
1
fastlane/metadata/android/fr-FR/changelogs/149.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
* Correction de la sauvegarde de l'emplacement des bases de données #2262
|
||||||
Reference in New Issue
Block a user