rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dialog preference description

Browse Source
This commit is contained in:
J-Jamet
2019-07-31 13:49:30 +02:00
parent b598945903
commit 03494d78a5
8 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDescriptionPreferenceDialogFragmentCompat.kt
View File

@@ -50,9 +50,6 @@ class DatabaseDescriptionPreferenceDialogFragmentCompat : InputDatabaseSavePrefe
override fun onFinishRun(result: Result) {
val descriptionToShow = mNewDescription
if (!result.isSuccess) {
activity?.let {
displayMessage(it)
}
database?.assignDescription(mOldDescription)
}
preference.summary = descriptionToShow

19
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.kt
View File

@@ -46,9 +46,9 @@ class DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat : DatabaseSavePr
recyclerView.adapter = encryptionAlgorithmAdapter
database?.let { database ->
algorithmSelected = database.encryptionAlgorithm
if (algorithmSelected != null)
encryptionAlgorithmAdapter.setItems(database.availableEncryptionAlgorithms, algorithmSelected!!)
algorithmSelected = database.encryptionAlgorithm?.apply {
encryptionAlgorithmAdapter.setItems(database.availableEncryptionAlgorithms, this)
}
}
}
}
@@ -80,15 +80,12 @@ class DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat : DatabaseSavePr
: ActionRunnable() {
override fun onFinishRun(result: Result) {
activity?.let { activity ->
var algorithmToShow = mNewAlgorithm
if (!result.isSuccess) {
displayMessage(activity)
database?.assignEncryptionAlgorithm(mOldAlgorithm)
algorithmToShow = mOldAlgorithm
}
preference.summary = algorithmToShow.getName(activity.resources)
var algorithmToShow = mNewAlgorithm
if (!result.isSuccess) {
database?.assignEncryptionAlgorithm(mOldAlgorithm)
algorithmToShow = mOldAlgorithm
}
preference.summary = algorithmToShow.getName(settingsResources)
}
}

9
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.kt
View File

@@ -94,13 +94,10 @@ class DatabaseKeyDerivationPreferenceDialogFragmentCompat : DatabaseSavePreferen
override fun onFinishRun(result: Result) {
val kdfEngineToShow = mNewKdfEngine
activity?.let { activity ->
if (!result.isSuccess) {
displayMessage(activity)
database?.assignKdfEngine(mOldKdfEngine)
}
preference.summary = kdfEngineToShow.getName(activity.resources)
if (!result.isSuccess) {
database?.assignKdfEngine(mOldKdfEngine)
}
preference.summary = kdfEngineToShow.getName(settingsResources)
roundPreference?.summary = kdfEngineToShow.defaultKeyRounds.toString()
// Disable memory and parallelism if not available

3
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseNamePreferenceDialogFragmentCompat.kt
View File

@@ -50,9 +50,6 @@ class DatabaseNamePreferenceDialogFragmentCompat : InputDatabaseSavePreferenceDi
override fun onFinishRun(result: Result) {
val nameToShow = mNewName
if (!result.isSuccess) {
activity?.let {
displayMessage(it)
}
database?.assignName(mOldName)
}
preference.summary = nameToShow

22
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseSavePreferenceDialogFragmentCompat.kt
View File

@@ -19,7 +19,10 @@
*/
package com.kunzisoft.keepass.settings.preferencedialogfragment
import android.content.res.Resources
import android.util.Log
import android.view.View
import android.widget.Toast
import com.kunzisoft.keepass.app.App
import com.kunzisoft.keepass.database.action.ProgressDialogSaveDatabaseThread
import com.kunzisoft.keepass.database.action.SaveDatabaseActionRunnable
@@ -32,10 +35,14 @@ abstract class DatabaseSavePreferenceDialogFragmentCompat : InputPreferenceDialo
var actionInUIThreadAfterSaveDatabase: ActionRunnable? = null
protected lateinit var settingsResources: Resources
override fun onBindDialogView(view: View) {
super.onBindDialogView(view)
this.database = App.currentDatabase
activity?.resources?.let { settingsResources = it }
}
override fun onDialogClosed(positiveResult: Boolean) {
@@ -48,11 +55,24 @@ abstract class DatabaseSavePreferenceDialogFragmentCompat : InputPreferenceDialo
notNullDatabase,
true)
}.apply {
actionFinishInUIThread = actionInUIThreadAfterSaveDatabase
actionFinishInUIThread = object:ActionRunnable() {
override fun onFinishRun(result: Result) {
if (!result.isSuccess) {
Log.e(TAG, result.message)
Toast.makeText(notNullActivity, result.message, Toast.LENGTH_SHORT).show()
}
actionInUIThreadAfterSaveDatabase?.onFinishRun(result)
}
}
start()
}
}
}
}
}
companion object {
private const val TAG = "DbSavePrefDialog"
}
}

3
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MemoryUsagePreferenceDialogFragmentCompat.kt
View File

@@ -65,9 +65,6 @@ class MemoryUsagePreferenceDialogFragmentCompat : InputDatabaseSavePreferenceDia
override fun onFinishRun(result: Result) {
val memoryToShow = mNewMemory
if (!result.isSuccess) {
activity?.let {
displayMessage(it)
}
database?.memoryUsage = mOldMemory
}
preference.summary = memoryToShow.toString()

3
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/ParallelismPreferenceDialogFragmentCompat.kt
View File

@@ -65,9 +65,6 @@ class ParallelismPreferenceDialogFragmentCompat : InputDatabaseSavePreferenceDia
override fun onFinishRun(result: Result) {
val parallelismToShow = mNewParallelism
if (!result.isSuccess) {
activity?.let {
displayMessage(it)
}
database?.parallelism = mOldParallelism
}
preference.summary = parallelismToShow.toString()

3
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/RoundsPreferenceDialogFragmentCompat.kt
View File

@@ -69,9 +69,6 @@ class RoundsPreferenceDialogFragmentCompat : InputDatabaseSavePreferenceDialogFr
override fun onFinishRun(result: Result) {
val roundsToShow = mNewRounds
if (!result.isSuccess) {
activity?.let {
displayMessage(it)
}
database?.numberKeyEncryptionRounds = mOldRounds
}