From e3db613a07a672750dcacea408e23292090bbc1c Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 7 Aug 2020 16:45:52 +0200 Subject: [PATCH] Rename progress database task provider --- .../keepass/activities/EntryActivity.kt | 8 ++++---- .../keepass/activities/EntryEditActivity.kt | 9 ++++----- .../activities/FileDatabaseSelectActivity.kt | 12 ++++++------ .../keepass/activities/GroupActivity.kt | 16 ++++++++-------- .../keepass/activities/PasswordActivity.kt | 12 ++++++------ .../keepass/activities/lock/LockingActivity.kt | 10 +++++----- ...Thread.kt => ProgressDatabaseTaskProvider.kt} | 2 +- .../settings/NestedDatabaseSettingsFragment.kt | 4 ++-- .../keepass/settings/SettingsActivity.kt | 6 +++--- ...atabaseColorPreferenceDialogFragmentCompat.kt | 2 +- ...aCompressionPreferenceDialogFragmentCompat.kt | 2 +- ...aultUsernamePreferenceDialogFragmentCompat.kt | 2 +- ...eDescriptionPreferenceDialogFragmentCompat.kt | 2 +- ...ionAlgorithmPreferenceDialogFragmentCompat.kt | 2 +- ...eyDerivationPreferenceDialogFragmentCompat.kt | 2 +- ...DatabaseNamePreferenceDialogFragmentCompat.kt | 2 +- ...DatabaseSavePreferenceDialogFragmentCompat.kt | 6 +++--- ...HistoryItemsPreferenceDialogFragmentCompat.kt | 2 +- ...xHistorySizePreferenceDialogFragmentCompat.kt | 2 +- .../MemoryUsagePreferenceDialogFragmentCompat.kt | 2 +- .../ParallelismPreferenceDialogFragmentCompat.kt | 2 +- .../RoundsPreferenceDialogFragmentCompat.kt | 2 +- 22 files changed, 54 insertions(+), 55 deletions(-) rename app/src/main/java/com/kunzisoft/keepass/database/action/{ProgressDialogThread.kt => ProgressDatabaseTaskProvider.kt} (99%) 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 09f441b3a..7e0bffaf2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt @@ -140,7 +140,7 @@ class EntryActivity : LockingActivity() { // Init attachment service binder manager mAttachmentFileBinderManager = AttachmentFileBinderManager(this) - mProgressDialogThread?.onActionFinish = { actionTask, result -> + mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result -> when (actionTask) { ACTION_DATABASE_RESTORE_ENTRY_HISTORY, ACTION_DATABASE_DELETE_ENTRY_HISTORY -> { @@ -523,7 +523,7 @@ class EntryActivity : LockingActivity() { } R.id.menu_restore_entry_history -> { mEntryLastVersion?.let { mainEntry -> - mProgressDialogThread?.startDatabaseRestoreEntryHistory( + mProgressDatabaseTaskProvider?.startDatabaseRestoreEntryHistory( mainEntry, mEntryHistoryPosition, !mReadOnly && mAutoSaveEnable) @@ -531,14 +531,14 @@ class EntryActivity : LockingActivity() { } R.id.menu_delete_entry_history -> { mEntryLastVersion?.let { mainEntry -> - mProgressDialogThread?.startDatabaseDeleteEntryHistory( + mProgressDatabaseTaskProvider?.startDatabaseDeleteEntryHistory( mainEntry, mEntryHistoryPosition, !mReadOnly && mAutoSaveEnable) } } R.id.menu_save_database -> { - mProgressDialogThread?.startDatabaseSave(!mReadOnly) + mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly) } android.R.id.home -> finish() // close this activity and return to preview activity (if there is any) } 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 beed23785..b2a89b39f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -28,7 +28,6 @@ import android.util.Log import android.view.Menu import android.view.MenuItem import android.view.View -import android.view.WindowManager import android.widget.DatePicker import android.widget.TimePicker import androidx.appcompat.app.AlertDialog @@ -253,7 +252,7 @@ class EntryEditActivity : LockingActivity(), entryEditActivityEducation = EntryEditActivityEducation(this) // Create progress dialog - mProgressDialogThread?.onActionFinish = { actionTask, result -> + mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result -> when (actionTask) { ACTION_DATABASE_CREATE_ENTRY_TASK, ACTION_DATABASE_UPDATE_ENTRY_TASK -> { @@ -397,7 +396,7 @@ class EntryEditActivity : LockingActivity(), // Open a progress dialog and save entry if (mIsNew) { mParent?.let { parent -> - mProgressDialogThread?.startDatabaseCreateEntry( + mProgressDatabaseTaskProvider?.startDatabaseCreateEntry( newEntry, parent, !mReadOnly && mAutoSaveEnable @@ -405,7 +404,7 @@ class EntryEditActivity : LockingActivity(), } } else { mEntry?.let { oldEntry -> - mProgressDialogThread?.startDatabaseUpdateEntry( + mProgressDatabaseTaskProvider?.startDatabaseUpdateEntry( oldEntry, newEntry, !mReadOnly && mAutoSaveEnable @@ -473,7 +472,7 @@ class EntryEditActivity : LockingActivity(), override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.menu_save_database -> { - mProgressDialogThread?.startDatabaseSave(!mReadOnly) + mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly) } R.id.menu_contribute -> { MenuUtil.onContributionItemSelected(this) 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 e9e52a8f2..3a044cf4f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt @@ -50,7 +50,7 @@ import com.kunzisoft.keepass.activities.selection.SpecialModeActivity import com.kunzisoft.keepass.adapters.FileDatabaseHistoryAdapter import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction import com.kunzisoft.keepass.autofill.AutofillHelper -import com.kunzisoft.keepass.database.action.ProgressDialogThread +import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation import com.kunzisoft.keepass.model.SearchInfo @@ -82,7 +82,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(), private var mOpenFileHelper: OpenFileHelper? = null - private var mProgressDialogThread: ProgressDialogThread? = null + private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -188,7 +188,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(), }) // Attach the dialog thread to this activity - mProgressDialogThread = ProgressDialogThread(this).apply { + mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply { onActionFinish = { actionTask, _ -> when (actionTask) { ACTION_DATABASE_CREATE_TASK -> { @@ -326,13 +326,13 @@ class FileDatabaseSelectActivity : SpecialModeActivity(), } // Register progress task - mProgressDialogThread?.registerProgressTask() + mProgressDatabaseTaskProvider?.registerProgressTask() } } override fun onPause() { // Unregister progress task - mProgressDialogThread?.unregisterProgressTask() + mProgressDatabaseTaskProvider?.unregisterProgressTask() super.onPause() } @@ -353,7 +353,7 @@ class FileDatabaseSelectActivity : SpecialModeActivity(), mDatabaseFileUri?.let { databaseUri -> // Create the new database - mProgressDialogThread?.startDatabaseCreate( + mProgressDatabaseTaskProvider?.startDatabaseCreate( databaseUri, masterPasswordChecked, masterPassword, 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 92c1d9b64..c56421254 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -221,7 +221,7 @@ class GroupActivity : LockingActivity(), mSearchSuggestionAdapter = SearchEntryCursorAdapter(this, database) // Init dialog thread - mProgressDialogThread?.onActionFinish = { actionTask, result -> + mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result -> var oldNodes: List = ArrayList() result.data?.getBundle(OLD_NODES_KEY)?.let { oldNodesBundle -> @@ -632,7 +632,7 @@ class GroupActivity : LockingActivity(), ListNodesFragment.PasteMode.PASTE_FROM_COPY -> { // Copy mCurrentGroup?.let { newParent -> - mProgressDialogThread?.startDatabaseCopyNodes( + mProgressDatabaseTaskProvider?.startDatabaseCopyNodes( nodes, newParent, !mReadOnly && mAutoSaveEnable @@ -642,7 +642,7 @@ class GroupActivity : LockingActivity(), ListNodesFragment.PasteMode.PASTE_FROM_MOVE -> { // Move mCurrentGroup?.let { newParent -> - mProgressDialogThread?.startDatabaseMoveNodes( + mProgressDatabaseTaskProvider?.startDatabaseMoveNodes( nodes, newParent, !mReadOnly && mAutoSaveEnable @@ -676,7 +676,7 @@ class GroupActivity : LockingActivity(), && database.isRecycleBinEnabled && database.recycleBin != mCurrentGroup) { - mProgressDialogThread?.startDatabaseDeleteNodes( + mProgressDatabaseTaskProvider?.startDatabaseDeleteNodes( nodes, !mReadOnly && mAutoSaveEnable ) @@ -691,7 +691,7 @@ class GroupActivity : LockingActivity(), } override fun permanentlyDeleteNodes(nodes: List) { - mProgressDialogThread?.startDatabaseDeleteNodes( + mProgressDatabaseTaskProvider?.startDatabaseDeleteNodes( nodes, !mReadOnly && mAutoSaveEnable ) @@ -852,7 +852,7 @@ class GroupActivity : LockingActivity(), //onSearchRequested(); return true R.id.menu_save_database -> { - mProgressDialogThread?.startDatabaseSave(!mReadOnly) + mProgressDatabaseTaskProvider?.startDatabaseSave(!mReadOnly) return true } R.id.menu_empty_recycle_bin -> { @@ -886,7 +886,7 @@ class GroupActivity : LockingActivity(), // Not really needed here because added in runnable but safe newGroup.parent = currentGroup - mProgressDialogThread?.startDatabaseCreateGroup( + mProgressDatabaseTaskProvider?.startDatabaseCreateGroup( newGroup, currentGroup, !mReadOnly && mAutoSaveEnable @@ -908,7 +908,7 @@ class GroupActivity : LockingActivity(), } } // If group updated save it in the database - mProgressDialogThread?.startDatabaseUpdateGroup( + mProgressDatabaseTaskProvider?.startDatabaseUpdateGroup( oldGroupToUpdate, updateGroup, !mReadOnly && mAutoSaveEnable diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt index b44166a84..443d4de28 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt @@ -52,7 +52,7 @@ import com.kunzisoft.keepass.activities.selection.SpecialModeActivity import com.kunzisoft.keepass.app.database.CipherDatabaseEntity import com.kunzisoft.keepass.autofill.AutofillHelper import com.kunzisoft.keepass.biometric.AdvancedUnlockedManager -import com.kunzisoft.keepass.database.action.ProgressDialogThread +import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException import com.kunzisoft.keepass.database.search.SearchHelper @@ -109,7 +109,7 @@ open class PasswordActivity : SpecialModeActivity() { field = value } - private var mProgressDialogThread: ProgressDialogThread? = null + private var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null private var advancedUnlockedManager: AdvancedUnlockedManager? = null private var mAllowAutoOpenBiometricPrompt: Boolean = true @@ -195,7 +195,7 @@ open class PasswordActivity : SpecialModeActivity() { onDatabaseFileLoaded(databaseFile?.databaseUri, keyFileUri) }) - mProgressDialogThread = ProgressDialogThread(this).apply { + mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this).apply { onActionFinish = { actionTask, result -> when (actionTask) { ACTION_DATABASE_LOAD_TASK -> { @@ -378,7 +378,7 @@ open class PasswordActivity : SpecialModeActivity() { clearCredentialsViews() } - mProgressDialogThread?.registerProgressTask() + mProgressDatabaseTaskProvider?.registerProgressTask() // Back to previous keyboard is setting activated if (PreferencesUtil.isKeyboardPreviousDatabaseCredentialsEnable(this)) { @@ -530,7 +530,7 @@ open class PasswordActivity : SpecialModeActivity() { } override fun onPause() { - mProgressDialogThread?.unregisterProgressTask() + mProgressDatabaseTaskProvider?.unregisterProgressTask() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { advancedUnlockedManager?.destroy() @@ -605,7 +605,7 @@ open class PasswordActivity : SpecialModeActivity() { readOnly: Boolean, cipherDatabaseEntity: CipherDatabaseEntity?, fixDuplicateUUID: Boolean) { - mProgressDialogThread?.startDatabaseLoad( + mProgressDatabaseTaskProvider?.startDatabaseLoad( databaseUri, password, keyFile, diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt index d63487362..7a7a7a512 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/lock/LockingActivity.kt @@ -27,7 +27,7 @@ import android.view.View import android.view.ViewGroup import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper import com.kunzisoft.keepass.activities.selection.SpecialModeActivity -import com.kunzisoft.keepass.database.action.ProgressDialogThread +import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.timeout.TimeoutHelper @@ -51,7 +51,7 @@ abstract class LockingActivity : SpecialModeActivity() { private var mReadOnlyToSave: Boolean = false protected var mAutoSaveEnable: Boolean = true - var mProgressDialogThread: ProgressDialogThread? = null + var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null private set override fun onCreate(savedInstanceState: Bundle?) { @@ -80,7 +80,7 @@ abstract class LockingActivity : SpecialModeActivity() { mExitLock = false - mProgressDialogThread = ProgressDialogThread(this) + mProgressDatabaseTaskProvider = ProgressDatabaseTaskProvider(this) } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -96,7 +96,7 @@ abstract class LockingActivity : SpecialModeActivity() { override fun onResume() { super.onResume() - mProgressDialogThread?.registerProgressTask() + mProgressDatabaseTaskProvider?.registerProgressTask() // To refresh when back to normal workflow from selection workflow mReadOnlyToSave = ReadOnlyHelper.retrieveReadOnlyFromIntent(intent) @@ -131,7 +131,7 @@ abstract class LockingActivity : SpecialModeActivity() { override fun onPause() { LOCKING_ACTIVITY_UI_VISIBLE = false - mProgressDialogThread?.unregisterProgressTask() + mProgressDatabaseTaskProvider?.unregisterProgressTask() super.onPause() diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt similarity index 99% rename from app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt rename to app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt index 27b6ccbc3..534a04a5b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt @@ -71,7 +71,7 @@ import com.kunzisoft.keepass.utils.DATABASE_STOP_TASK_ACTION import java.util.* import kotlin.collections.ArrayList -class ProgressDialogThread(private val activity: FragmentActivity) { +class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) { var onActionFinish: ((actionTask: String, result: ActionRunnable.Result) -> Unit)? = null diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt index 34d4f705d..3f0bdbebf 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt @@ -166,7 +166,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() { refreshRecycleBinGroup() // Save the database if not in readonly mode (context as SettingsActivity?)?. - mProgressDialogThread?.startDatabaseSave(mDatabaseAutoSaveEnabled) + mProgressDatabaseTaskProvider?.startDatabaseSave(mDatabaseAutoSaveEnabled) true } true @@ -546,7 +546,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() { return when (item.itemId) { R.id.menu_save_database -> { - settingActivity?.mProgressDialogThread?.startDatabaseSave(!mDatabaseReadOnly) + settingActivity?.mProgressDatabaseTaskProvider?.startDatabaseSave(!mDatabaseReadOnly) true } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt index 29f01e7ab..ac8ac213a 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt @@ -105,7 +105,7 @@ open class SettingsActivity backupManager = BackupManager(this) - mProgressDialogThread?.onActionFinish = { actionTask, result -> + mProgressDatabaseTaskProvider?.onActionFinish = { actionTask, result -> // Call result in fragment (supportFragmentManager .findFragmentByTag(TAG_NESTED) as NestedSettingsFragment?) @@ -136,7 +136,7 @@ open class SettingsActivity database.fileUri?.let { databaseUri -> // Show the progress dialog now or after dialog confirmation if (database.validatePasswordEncoding(masterPassword, keyFileChecked)) { - mProgressDialogThread?.startDatabaseAssignPassword( + mProgressDatabaseTaskProvider?.startDatabaseAssignPassword( databaseUri, masterPasswordChecked, masterPassword, @@ -146,7 +146,7 @@ open class SettingsActivity } else { PasswordEncodingDialogFragment().apply { positiveButtonClickListener = DialogInterface.OnClickListener { _, _ -> - mProgressDialogThread?.startDatabaseAssignPassword( + mProgressDatabaseTaskProvider?.startDatabaseAssignPassword( databaseUri, masterPasswordChecked, masterPassword, diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt index 9e1ede518..27533158e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt @@ -86,7 +86,7 @@ class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialog } val oldColor = database.customColor database.customColor = newColor - mProgressDialogThread?.startDatabaseSaveColor(oldColor, newColor, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveColor(oldColor, newColor, mDatabaseAutoSaveEnable) } onDialogClosed(true) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDataCompressionPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDataCompressionPreferenceDialogFragmentCompat.kt index 5ad8641de..3f0fa9b3f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDataCompressionPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDataCompressionPreferenceDialogFragmentCompat.kt @@ -64,7 +64,7 @@ class DatabaseDataCompressionPreferenceDialogFragmentCompat database.compressionAlgorithm = newCompression if (oldCompression != null && newCompression != null) - mProgressDialogThread?.startDatabaseSaveCompression(oldCompression, newCompression, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveCompression(oldCompression, newCompression, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDefaultUsernamePreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDefaultUsernamePreferenceDialogFragmentCompat.kt index 8b1c122eb..19eef2c15 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDefaultUsernamePreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDefaultUsernamePreferenceDialogFragmentCompat.kt @@ -36,7 +36,7 @@ class DatabaseDefaultUsernamePreferenceDialogFragmentCompat : DatabaseSavePrefer val newDefaultUsername = inputText val oldDefaultUsername = database.defaultUsername database.defaultUsername = newDefaultUsername - mProgressDialogThread?.startDatabaseSaveDefaultUsername(oldDefaultUsername, newDefaultUsername, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveDefaultUsername(oldDefaultUsername, newDefaultUsername, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDescriptionPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDescriptionPreferenceDialogFragmentCompat.kt index 7117383fc..fa8c47689 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDescriptionPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDescriptionPreferenceDialogFragmentCompat.kt @@ -36,7 +36,7 @@ class DatabaseDescriptionPreferenceDialogFragmentCompat : DatabaseSavePreference val newDescription = inputText val oldDescription = database.description database.description = newDescription - mProgressDialogThread?.startDatabaseSaveDescription(oldDescription, newDescription, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveDescription(oldDescription, newDescription, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.kt index aa2451749..8d4179fdd 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.kt @@ -65,7 +65,7 @@ class DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat database.encryptionAlgorithm = newAlgorithm if (oldAlgorithm != null && newAlgorithm != null) - mProgressDialogThread?.startDatabaseSaveEncryption(oldAlgorithm, newAlgorithm, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveEncryption(oldAlgorithm, newAlgorithm, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.kt index c8c8ee91b..dc7ff9d64 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.kt @@ -66,7 +66,7 @@ class DatabaseKeyDerivationPreferenceDialogFragmentCompat val oldKdfEngine = database.kdfEngine if (newKdfEngine != null && oldKdfEngine != null) { database.kdfEngine = newKdfEngine - mProgressDialogThread?.startDatabaseSaveKeyDerivation(oldKdfEngine, newKdfEngine, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveKeyDerivation(oldKdfEngine, newKdfEngine, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseNamePreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseNamePreferenceDialogFragmentCompat.kt index 424ce1064..e2d39c459 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseNamePreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseNamePreferenceDialogFragmentCompat.kt @@ -36,7 +36,7 @@ class DatabaseNamePreferenceDialogFragmentCompat : DatabaseSavePreferenceDialogF val newName = inputText val oldName = database.name database.name = newName - mProgressDialogThread?.startDatabaseSaveName(oldName, newName, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveName(oldName, newName, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseSavePreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseSavePreferenceDialogFragmentCompat.kt index 71b22bdc6..e28397ffa 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseSavePreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseSavePreferenceDialogFragmentCompat.kt @@ -21,7 +21,7 @@ package com.kunzisoft.keepass.settings.preferencedialogfragment import android.content.Context import android.os.Bundle -import com.kunzisoft.keepass.database.action.ProgressDialogThread +import com.kunzisoft.keepass.database.action.ProgressDatabaseTaskProvider import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.settings.SettingsActivity @@ -30,7 +30,7 @@ abstract class DatabaseSavePreferenceDialogFragmentCompat : InputPreferenceDialo protected var database: Database? = null protected var mDatabaseAutoSaveEnable = true - protected var mProgressDialogThread: ProgressDialogThread? = null + protected var mProgressDatabaseTaskProvider: ProgressDatabaseTaskProvider? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -42,7 +42,7 @@ abstract class DatabaseSavePreferenceDialogFragmentCompat : InputPreferenceDialo super.onAttach(context) // Attach dialog thread to start action if (context is SettingsActivity) { - mProgressDialogThread = context.mProgressDialogThread + mProgressDatabaseTaskProvider = context.mProgressDatabaseTaskProvider } this.mDatabaseAutoSaveEnable = PreferencesUtil.isAutoSaveDatabaseEnabled(context) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistoryItemsPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistoryItemsPreferenceDialogFragmentCompat.kt index 371b7588c..b0eff25d1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistoryItemsPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistoryItemsPreferenceDialogFragmentCompat.kt @@ -60,7 +60,7 @@ class MaxHistoryItemsPreferenceDialogFragmentCompat : DatabaseSavePreferenceDial // Remove all history items database.removeOldestHistoryForEachEntry() - mProgressDialogThread?.startDatabaseSaveMaxHistoryItems(oldMaxHistoryItems, maxHistoryItems, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveMaxHistoryItems(oldMaxHistoryItems, maxHistoryItems, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistorySizePreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistorySizePreferenceDialogFragmentCompat.kt index 1719b54cf..61a0cb9d1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistorySizePreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MaxHistorySizePreferenceDialogFragmentCompat.kt @@ -56,7 +56,7 @@ class MaxHistorySizePreferenceDialogFragmentCompat : DatabaseSavePreferenceDialo val oldMaxHistorySize = database.historyMaxSize database.historyMaxSize = maxHistorySize - mProgressDialogThread?.startDatabaseSaveMaxHistorySize(oldMaxHistorySize, maxHistorySize, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveMaxHistorySize(oldMaxHistorySize, maxHistorySize, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MemoryUsagePreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MemoryUsagePreferenceDialogFragmentCompat.kt index b05be4f28..11cd7dc8e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MemoryUsagePreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/MemoryUsagePreferenceDialogFragmentCompat.kt @@ -48,7 +48,7 @@ class MemoryUsagePreferenceDialogFragmentCompat : DatabaseSavePreferenceDialogFr val oldMemoryUsage = database.memoryUsage database.memoryUsage = memoryUsage - mProgressDialogThread?.startDatabaseSaveMemoryUsage(oldMemoryUsage, memoryUsage, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveMemoryUsage(oldMemoryUsage, memoryUsage, mDatabaseAutoSaveEnable) } } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/ParallelismPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/ParallelismPreferenceDialogFragmentCompat.kt index f5645c89a..62c2999b5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/ParallelismPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/ParallelismPreferenceDialogFragmentCompat.kt @@ -44,7 +44,7 @@ class ParallelismPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialogFr val oldParallelism = database.parallelism database.parallelism = parallelism - mProgressDialogThread?.startDatabaseSaveParallelism( + mProgressDatabaseTaskProvider?.startDatabaseSaveParallelism( oldParallelism, parallelism, mDatabaseAutoSaveEnable) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/RoundsPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/RoundsPreferenceDialogFragmentCompat.kt index 9bbe70f48..8042bb220 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/RoundsPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/RoundsPreferenceDialogFragmentCompat.kt @@ -54,7 +54,7 @@ class RoundsPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialogFragmen database.numberKeyEncryptionRounds = Long.MAX_VALUE } - mProgressDialogThread?.startDatabaseSaveIterations(oldRounds, rounds, mDatabaseAutoSaveEnable) + mProgressDatabaseTaskProvider?.startDatabaseSaveIterations(oldRounds, rounds, mDatabaseAutoSaveEnable) } } }