diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt index bd5931856..6a562bad4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt @@ -21,18 +21,18 @@ import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Compa import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_COLOR_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_COMPRESSION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_DESCRIPTION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_ENCRYPTION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_ITERATIONS_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_NAME_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_PARALLELISM_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COLOR_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COMPRESSION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_DESCRIPTION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENCRYPTION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ITERATIONS_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_NAME_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_PARALLELISM_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_GROUP_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes @@ -357,7 +357,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newName) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_NAME_TASK) + , ACTION_DATABASE_UPDATE_NAME_TASK) } fun startDatabaseSaveDescription(oldDescription: String, @@ -368,7 +368,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newDescription) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_DESCRIPTION_TASK) + , ACTION_DATABASE_UPDATE_DESCRIPTION_TASK) } fun startDatabaseSaveDefaultUsername(oldDefaultUsername: String, @@ -379,7 +379,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newDefaultUsername) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK) + , ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK) } fun startDatabaseSaveColor(oldColor: String, @@ -390,7 +390,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putString(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newColor) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_COLOR_TASK) + , ACTION_DATABASE_UPDATE_COLOR_TASK) } fun startDatabaseSaveCompression(oldCompression: PwCompressionAlgorithm, @@ -401,7 +401,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newCompression) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_COMPRESSION_TASK) + , ACTION_DATABASE_UPDATE_COMPRESSION_TASK) } fun startDatabaseSaveMaxHistoryItems(oldMaxHistoryItems: Int, @@ -412,7 +412,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putInt(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMaxHistoryItems) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK) + , ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK) } fun startDatabaseSaveMaxHistorySize(oldMaxHistorySize: Long, @@ -423,7 +423,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMaxHistorySize) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK) + , ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK) } /* @@ -440,7 +440,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newEncryption) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_ENCRYPTION_TASK) + , ACTION_DATABASE_UPDATE_ENCRYPTION_TASK) } fun startDatabaseSaveKeyDerivation(oldKeyDerivation: KdfEngine, @@ -451,7 +451,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putSerializable(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newKeyDerivation) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK) + , ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK) } fun startDatabaseSaveIterations(oldIterations: Long, @@ -462,7 +462,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newIterations) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_ITERATIONS_TASK) + , ACTION_DATABASE_UPDATE_ITERATIONS_TASK) } fun startDatabaseSaveMemoryUsage(oldMemoryUsage: Long, @@ -473,7 +473,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putLong(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newMemoryUsage) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK) + , ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK) } fun startDatabaseSaveParallelism(oldParallelism: Int, @@ -484,7 +484,7 @@ class ProgressDialogThread(private val activity: FragmentActivity) { putInt(DatabaseTaskNotificationService.NEW_ELEMENT_KEY, newParallelism) putBoolean(DatabaseTaskNotificationService.SAVE_DATABASE_KEY, save) } - , ACTION_DATABASE_SAVE_PARALLELISM_TASK) + , ACTION_DATABASE_UPDATE_PARALLELISM_TASK) } /** diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt index d46c1010e..56fedf46b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt @@ -70,17 +70,28 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat val intentAction = intent.action + var saveAction = true + if (intent.hasExtra(SAVE_DATABASE_KEY)) { + saveAction = intent.getBooleanExtra(SAVE_DATABASE_KEY, saveAction) + } + val titleId: Int = when (intentAction) { ACTION_DATABASE_CREATE_TASK -> R.string.creating_database ACTION_DATABASE_LOAD_TASK -> R.string.loading_database - else -> R.string.saving_database + else -> { + if (saveAction) + R.string.saving_database + else + R.string.command_execution + } } val messageId: Int? = when (intentAction) { ACTION_DATABASE_LOAD_TASK -> null else -> null } val warningId: Int? = - if (intentAction == ACTION_DATABASE_LOAD_TASK) + if (!saveAction + || intentAction == ACTION_DATABASE_LOAD_TASK) null else R.string.do_not_kill_app @@ -96,19 +107,20 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat ACTION_DATABASE_COPY_NODES_TASK -> buildDatabaseCopyNodesActionTask(intent) ACTION_DATABASE_MOVE_NODES_TASK -> buildDatabaseMoveNodesActionTask(intent) ACTION_DATABASE_DELETE_NODES_TASK -> buildDatabaseDeleteNodesActionTask(intent) - ACTION_DATABASE_SAVE_NAME_TASK, - ACTION_DATABASE_SAVE_DESCRIPTION_TASK, - ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK, - ACTION_DATABASE_SAVE_COLOR_TASK, - ACTION_DATABASE_SAVE_COMPRESSION_TASK, - ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK, - ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK, - ACTION_DATABASE_SAVE_ENCRYPTION_TASK, - ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK, - ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK, - ACTION_DATABASE_SAVE_PARALLELISM_TASK, - ACTION_DATABASE_SAVE_ITERATIONS_TASK -> buildDatabaseSaveElementActionTask(intent) - else -> buildDatabaseSave(intent) + ACTION_DATABASE_UPDATE_NAME_TASK, + ACTION_DATABASE_UPDATE_DESCRIPTION_TASK, + ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK, + ACTION_DATABASE_UPDATE_COLOR_TASK, + ACTION_DATABASE_UPDATE_COMPRESSION_TASK, + ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK, + ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK, + ACTION_DATABASE_UPDATE_ENCRYPTION_TASK, + ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK, + ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK, + ACTION_DATABASE_UPDATE_PARALLELISM_TASK, + ACTION_DATABASE_UPDATE_ITERATIONS_TASK -> buildDatabaseUpdateElementActionTask(intent) + ACTION_DATABASE_SAVE -> buildDatabaseSave(intent) + else -> null } actionRunnable?.let { actionRunnableNotNull -> @@ -397,7 +409,7 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat } } - private fun buildDatabaseSaveElementActionTask(intent: Intent): ActionRunnable? { + private fun buildDatabaseUpdateElementActionTask(intent: Intent): ActionRunnable? { return if (intent.hasExtra(SAVE_DATABASE_KEY)) { return SaveDatabaseRunnable(this, Database.getInstance(), @@ -472,18 +484,18 @@ class DatabaseTaskNotificationService : NotificationService(), ProgressTaskUpdat const val ACTION_DATABASE_COPY_NODES_TASK = "ACTION_DATABASE_COPY_NODES_TASK" const val ACTION_DATABASE_MOVE_NODES_TASK = "ACTION_DATABASE_MOVE_NODES_TASK" const val ACTION_DATABASE_DELETE_NODES_TASK = "ACTION_DATABASE_DELETE_NODES_TASK" - const val ACTION_DATABASE_SAVE_NAME_TASK = "ACTION_DATABASE_SAVE_NAME_TASK" - const val ACTION_DATABASE_SAVE_DESCRIPTION_TASK = "ACTION_DATABASE_SAVE_DESCRIPTION_TASK" - const val ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK = "ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK" - const val ACTION_DATABASE_SAVE_COLOR_TASK = "ACTION_DATABASE_SAVE_COLOR_TASK" - const val ACTION_DATABASE_SAVE_COMPRESSION_TASK = "ACTION_DATABASE_SAVE_COMPRESSION_TASK" - const val ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK = "ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK" - const val ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK = "ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK" - const val ACTION_DATABASE_SAVE_ENCRYPTION_TASK = "ACTION_DATABASE_SAVE_ENCRYPTION_TASK" - const val ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK = "ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK" - const val ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK = "ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK" - const val ACTION_DATABASE_SAVE_PARALLELISM_TASK = "ACTION_DATABASE_SAVE_PARALLELISM_TASK" - const val ACTION_DATABASE_SAVE_ITERATIONS_TASK = "ACTION_DATABASE_SAVE_ITERATIONS_TASK" + const val ACTION_DATABASE_UPDATE_NAME_TASK = "ACTION_DATABASE_UPDATE_NAME_TASK" + const val ACTION_DATABASE_UPDATE_DESCRIPTION_TASK = "ACTION_DATABASE_UPDATE_DESCRIPTION_TASK" + const val ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK = "ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK" + const val ACTION_DATABASE_UPDATE_COLOR_TASK = "ACTION_DATABASE_UPDATE_COLOR_TASK" + const val ACTION_DATABASE_UPDATE_COMPRESSION_TASK = "ACTION_DATABASE_UPDATE_COMPRESSION_TASK" + const val ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK = "ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK" + const val ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK = "ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK" + const val ACTION_DATABASE_UPDATE_ENCRYPTION_TASK = "ACTION_DATABASE_UPDATE_ENCRYPTION_TASK" + const val ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK = "ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK" + const val ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK = "ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK" + const val ACTION_DATABASE_UPDATE_PARALLELISM_TASK = "ACTION_DATABASE_UPDATE_PARALLELISM_TASK" + const val ACTION_DATABASE_UPDATE_ITERATIONS_TASK = "ACTION_DATABASE_UPDATE_ITERATIONS_TASK" const val ACTION_DATABASE_SAVE = "ACTION_DATABASE_SAVE" const val DATABASE_URI_KEY = "DATABASE_URI_KEY" diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt index a9ae51b96..02b6bc244 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt @@ -20,7 +20,6 @@ package com.kunzisoft.keepass.settings import android.content.ActivityNotFoundException -import android.content.Context import android.content.Intent import android.content.res.Resources import android.graphics.Color @@ -54,18 +53,18 @@ import com.kunzisoft.keepass.database.element.PwCompressionAlgorithm import com.kunzisoft.keepass.database.element.PwEncryptionAlgorithm import com.kunzisoft.keepass.education.Education import com.kunzisoft.keepass.icons.IconPackChooser -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_COLOR_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_COMPRESSION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_DESCRIPTION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_ENCRYPTION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_ITERATIONS_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_NAME_TASK -import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_SAVE_PARALLELISM_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COLOR_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_COMPRESSION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_DESCRIPTION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENCRYPTION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ITERATIONS_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_NAME_TASK +import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_PARALLELISM_TASK import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.NEW_ELEMENT_KEY import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.OLD_ELEMENT_KEY import com.kunzisoft.keepass.settings.preference.* @@ -659,7 +658,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { Main preferences -------- */ - ACTION_DATABASE_SAVE_NAME_TASK -> { + ACTION_DATABASE_UPDATE_NAME_TASK -> { val oldName = data.getString(OLD_ELEMENT_KEY)!! val newName = data.getString(NEW_ELEMENT_KEY)!! val nameToShow = @@ -671,7 +670,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } dbNamePref?.summary = nameToShow } - ACTION_DATABASE_SAVE_DESCRIPTION_TASK -> { + ACTION_DATABASE_UPDATE_DESCRIPTION_TASK -> { val oldDescription = data.getString(OLD_ELEMENT_KEY)!! val newDescription = data.getString(NEW_ELEMENT_KEY)!! val descriptionToShow = @@ -683,7 +682,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } dbDescriptionPref?.summary = descriptionToShow } - ACTION_DATABASE_SAVE_DEFAULT_USERNAME_TASK -> { + ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK -> { val oldDefaultUsername = data.getString(OLD_ELEMENT_KEY)!! val newDefaultUsername = data.getString(NEW_ELEMENT_KEY)!! val defaultUsernameToShow = @@ -695,7 +694,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } dbDefaultUsername?.summary = defaultUsernameToShow } - ACTION_DATABASE_SAVE_COLOR_TASK -> { + ACTION_DATABASE_UPDATE_COLOR_TASK -> { val oldColor = data.getString(OLD_ELEMENT_KEY)!! val newColor = data.getString(NEW_ELEMENT_KEY)!! @@ -708,7 +707,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } dbCustomColorPref?.summary = defaultColorToShow } - ACTION_DATABASE_SAVE_COMPRESSION_TASK -> { + ACTION_DATABASE_UPDATE_COMPRESSION_TASK -> { val oldCompression = data.getSerializable(OLD_ELEMENT_KEY) as PwCompressionAlgorithm val newCompression = data.getSerializable(NEW_ELEMENT_KEY) as PwCompressionAlgorithm val algorithmToShow = @@ -720,7 +719,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } dbDataCompressionPref?.summary = algorithmToShow.getName(resources) } - ACTION_DATABASE_SAVE_MAX_HISTORY_ITEMS_TASK -> { + ACTION_DATABASE_UPDATE_MAX_HISTORY_ITEMS_TASK -> { val oldMaxHistoryItems = data.getInt(OLD_ELEMENT_KEY) val newMaxHistoryItems = data.getInt(NEW_ELEMENT_KEY) val maxHistoryItemsToShow = @@ -732,7 +731,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } dbMaxHistoryItemsPref?.summary = maxHistoryItemsToShow.toString() } - ACTION_DATABASE_SAVE_MAX_HISTORY_SIZE_TASK -> { + ACTION_DATABASE_UPDATE_MAX_HISTORY_SIZE_TASK -> { val oldMaxHistorySize = data.getLong(OLD_ELEMENT_KEY) val newMaxHistorySize = data.getLong(NEW_ELEMENT_KEY) val maxHistorySizeToShow = @@ -750,7 +749,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { Security -------- */ - ACTION_DATABASE_SAVE_ENCRYPTION_TASK -> { + ACTION_DATABASE_UPDATE_ENCRYPTION_TASK -> { val oldEncryption = data.getSerializable(OLD_ELEMENT_KEY) as PwEncryptionAlgorithm val newEncryption = data.getSerializable(NEW_ELEMENT_KEY) as PwEncryptionAlgorithm val algorithmToShow = @@ -762,7 +761,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } mEncryptionAlgorithmPref?.summary = algorithmToShow.getName(resources) } - ACTION_DATABASE_SAVE_KEY_DERIVATION_TASK -> { + ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK -> { val oldKeyDerivationEngine = data.getSerializable(OLD_ELEMENT_KEY) as KdfEngine val newKeyDerivationEngine = data.getSerializable(NEW_ELEMENT_KEY) as KdfEngine val kdfEngineToShow = @@ -779,7 +778,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { mMemoryPref?.summary = kdfEngineToShow.defaultMemoryUsage.toString() mParallelismPref?.summary = kdfEngineToShow.defaultParallelism.toString() } - ACTION_DATABASE_SAVE_ITERATIONS_TASK -> { + ACTION_DATABASE_UPDATE_ITERATIONS_TASK -> { val oldIterations = data.getLong(OLD_ELEMENT_KEY) val newIterations = data.getLong(NEW_ELEMENT_KEY) val roundsToShow = @@ -791,7 +790,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } mRoundPref?.summary = roundsToShow.toString() } - ACTION_DATABASE_SAVE_MEMORY_USAGE_TASK -> { + ACTION_DATABASE_UPDATE_MEMORY_USAGE_TASK -> { val oldMemoryUsage = data.getLong(OLD_ELEMENT_KEY) val newMemoryUsage = data.getLong(NEW_ELEMENT_KEY) val memoryToShow = @@ -803,7 +802,7 @@ class NestedSettingsFragment : PreferenceFragmentCompat() { } mMemoryPref?.summary = memoryToShow.toString() } - ACTION_DATABASE_SAVE_PARALLELISM_TASK -> { + ACTION_DATABASE_UPDATE_PARALLELISM_TASK -> { val oldParallelism = data.getInt(OLD_ELEMENT_KEY) val newParallelism = data.getInt(NEW_ELEMENT_KEY) val parallelismToShow = diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 717ce514c..3585eba21 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -218,6 +218,7 @@ Parallelism Degree of parallelism (i.e. number of threads) used by the key derivation function. Saving database… + Executing the command… Do not kill the app… Space Search