From f60e2e2ca68d460d99ea7fd2586a41b30bbbde77 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 6 Aug 2021 20:40:40 +0200 Subject: [PATCH] Fix reload activity --- app/src/main/AndroidManifest.xml | 3 +- .../keepass/activities/EntryActivity.kt | 6 ---- .../keepass/activities/EntryEditActivity.kt | 6 ---- .../keepass/activities/GroupActivity.kt | 30 +++++++----------- .../activities/lock/LockingActivity.kt | 18 +++-------- .../activities/selection/DatabaseActivity.kt | 9 ++++++ .../activities/stylish/StylishActivity.kt | 10 ++++-- .../settings/NestedAppSettingsFragment.kt | 4 +-- .../keepass/settings/SettingsActivity.kt | 31 ++++++------------- 9 files changed, 45 insertions(+), 72 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 888f551df..289f816ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -144,8 +144,7 @@ android:launchMode="singleTask" android:label="@string/about" /> + android:name="com.kunzisoft.keepass.settings.SettingsActivity" /> { - // Close the current activity - this.showActionErrorIfNeeded(result) - finish() - } } coordinatorLayout?.showActionErrorIfNeeded(result) } 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 bfcdef5ea..822495074 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -62,7 +62,6 @@ import com.kunzisoft.keepass.services.AttachmentFileNotificationService import com.kunzisoft.keepass.services.ClipboardEntryNotificationService import com.kunzisoft.keepass.services.DatabaseTaskNotificationService import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_ENTRY_TASK -import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK import com.kunzisoft.keepass.services.KeyboardEntryNotificationService import com.kunzisoft.keepass.settings.PreferencesUtil @@ -328,11 +327,6 @@ class EntryEditActivity : LockingActivity(), Log.e(TAG, "Unable to retrieve entry after database action", e) } } - ACTION_DATABASE_RELOAD_TASK -> { - // Close the current activity - this.showActionErrorIfNeeded(result) - finish() - } } coordinatorLayout?.showActionErrorIfNeeded(result) } 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 4dcb59ed4..ffe7e8c4d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -66,7 +66,6 @@ import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion. import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_GROUP_TASK import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_DELETE_NODES_TASK import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_MOVE_NODES_TASK -import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_RELOAD_TASK import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_ENTRY_TASK import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_UPDATE_GROUP_TASK import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.NEW_NODES_KEY @@ -450,20 +449,13 @@ class GroupActivity : LockingActivity(), } } } - ACTION_DATABASE_RELOAD_TASK -> { - // Reload the current activity - if (!result.isSuccess) { - this.showActionErrorIfNeeded(result) - finish() - } - } } coordinatorLayout?.showActionErrorIfNeeded(result) finishNodeAction() - refreshNumberOfChildren() + refreshNumberOfChildren(mCurrentGroup) } override fun onNewIntent(intent: Intent?) { @@ -544,7 +536,7 @@ class GroupActivity : LockingActivity(), } if (toolbar != null) { - if (mCurrentGroup?.containsParent() == true) + if (group.containsParent()) toolbar?.setNavigationIcon(R.drawable.ic_arrow_up_white_24dp) else { toolbar?.navigationIcon = null @@ -554,35 +546,35 @@ class GroupActivity : LockingActivity(), } // Assign number of children - refreshNumberOfChildren() + refreshNumberOfChildren(group) // Hide button - initAddButton() + initAddButton(group) } - private fun initAddButton() { + private fun initAddButton(group: Group?) { addNodeButtonView?.apply { closeButtonIfOpen() // To enable add button - val addGroupEnabled = !mReadOnly && mCurrentGroup?.isVirtual != true - var addEntryEnabled = !mReadOnly && mCurrentGroup?.isVirtual != true - mCurrentGroup?.let { + val addGroupEnabled = !mReadOnly && group?.isVirtual != true + var addEntryEnabled = !mReadOnly && group?.isVirtual != true + group?.let { if (!it.allowAddEntryIfIsRoot) addEntryEnabled = it != mRootGroup && addEntryEnabled } enableAddGroup(addGroupEnabled) enableAddEntry(addEntryEnabled) - if (mCurrentGroup?.isVirtual == true) + if (group?.isVirtual == true) hideButton() else if (actionNodeMode == null) showButton() } } - private fun refreshNumberOfChildren() { + private fun refreshNumberOfChildren(group: Group?) { numberChildrenView?.apply { if (PreferencesUtil.showNumberEntries(context)) { - text = mCurrentGroup?.getNumberOfChildEntries(Group.ChildFilter.getDefaults(context))?.toString() ?: "" + text = group?.getNumberOfChildEntries(Group.ChildFilter.getDefaults(context))?.toString() ?: "" visibility = View.VISIBLE } else { visibility = View.GONE 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 94717e81b..96068fe4a 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 @@ -50,6 +50,7 @@ import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.tasks.ActionRunnable import com.kunzisoft.keepass.timeout.TimeoutHelper import com.kunzisoft.keepass.utils.* +import com.kunzisoft.keepass.view.showActionErrorIfNeeded import com.kunzisoft.keepass.viewmodels.NodesViewModel import java.util.* @@ -147,7 +148,10 @@ abstract class LockingActivity : SpecialModeActivity(), DatabaseTaskNotificationService.ACTION_DATABASE_RELOAD_TASK -> { // Reload the current activity if (result.isSuccess) { - reload(database) + reloadActivity() + } else { + this.showActionErrorIfNeeded(result) + finish() } } } @@ -285,21 +289,9 @@ abstract class LockingActivity : SpecialModeActivity(), } } - private fun reload(database: Database) { - // Reload the current activity - startActivity(intent) - finish() - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) - database.wasReloaded = false - } - override fun onResume() { super.onResume() - if (mDatabase?.wasReloaded == true) { - reload(mDatabase!!) - } - // If in ave or registration mode, don't allow read only if ((mSpecialMode == SpecialMode.SAVE || mSpecialMode == SpecialMode.REGISTRATION) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/selection/DatabaseActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/selection/DatabaseActivity.kt index 199a5a73f..752e24c1d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/selection/DatabaseActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/selection/DatabaseActivity.kt @@ -204,8 +204,17 @@ abstract class DatabaseActivity: StylishActivity(), DatabaseRetrieval { mDatabase?.clearAndClose(this) } + override fun reloadActivity() { + super.reloadActivity() + mDatabase?.wasReloaded = false + } + override fun onResume() { super.onResume() + + if (mDatabase?.wasReloaded == true) { + reloadActivity() + } mDatabaseTaskProvider?.registerProgressTask() } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt index 79b18e803..c8018f1e0 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/StylishActivity.kt @@ -22,10 +22,10 @@ package com.kunzisoft.keepass.activities.stylish import android.content.ActivityNotFoundException import android.content.Intent import android.os.Bundle -import androidx.annotation.StyleRes -import androidx.appcompat.app.AppCompatActivity import android.util.Log import android.view.WindowManager +import androidx.annotation.StyleRes +import androidx.appcompat.app.AppCompatActivity /** * Stylish Hide Activity that apply a dynamic style and sets FLAG_SECURE to prevent screenshots / from @@ -57,6 +57,12 @@ abstract class StylishActivity : AppCompatActivity() { return true } + open fun reloadActivity() { + startActivity(intent) + finish() + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt index d73945abd..af6032882 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt @@ -402,7 +402,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { Stylish.assignStyle(activity, styleIdString) // Relaunch the current activity to redraw theme (activity as? SettingsActivity?)?.apply { - relaunchCurrentScreen() + reloadActivity() } } styleEnabled @@ -410,7 +410,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { findPreference(getString(R.string.setting_style_brightness_key))?.setOnPreferenceChangeListener { _, _ -> (activity as? SettingsActivity?)?.apply { - relaunchCurrentScreen() + reloadActivity() } 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 2c73a4581..dc9f85c01 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt @@ -38,7 +38,6 @@ import com.kunzisoft.keepass.activities.lock.LockingActivity import com.kunzisoft.keepass.activities.lock.resetAppTimeoutWhenViewFocusedOrChanged import com.kunzisoft.keepass.database.element.Database import com.kunzisoft.keepass.model.MainCredential -import com.kunzisoft.keepass.services.DatabaseTaskNotificationService import com.kunzisoft.keepass.tasks.ActionRunnable import com.kunzisoft.keepass.timeout.TimeoutHelper import com.kunzisoft.keepass.view.showActionErrorIfNeeded @@ -121,20 +120,15 @@ open class SettingsActivity result: ActionRunnable.Result ) { super.onDatabaseActionFinished(database, actionTask, result) - when (actionTask) { - DatabaseTaskNotificationService.ACTION_DATABASE_RELOAD_TASK -> { - // Reload the current activity - if (result.isSuccess) { - relaunchCurrentScreen() - } else { - this.showActionErrorIfNeeded(result) - finish() - } - } - } + coordinatorLayout?.showActionErrorIfNeeded(result) } + override fun reloadActivity() { + keepCurrentScreen() + super.reloadActivity() + } + override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { android.R.id.home -> onBackPressed() @@ -200,13 +194,6 @@ open class SettingsActivity hideOrShowLockButton(key) } - fun relaunchCurrentScreen() { - keepCurrentScreen() - startActivity(intent) - finish() - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) - } - /** * To keep the current screen when activity is reloaded */ @@ -240,8 +227,8 @@ open class SettingsActivity // Import app properties result try { - mExternalFileHelper?.onOpenDocumentResult(requestCode, resultCode, data) { selectedfileUri -> - selectedfileUri?.let { uri -> + mExternalFileHelper?.onOpenDocumentResult(requestCode, resultCode, data) { selectedFileUri -> + selectedFileUri?.let { uri -> val appProperties = Properties() contentResolver?.openInputStream(uri)?.use { inputStream -> appProperties.load(inputStream) @@ -249,7 +236,7 @@ open class SettingsActivity PreferencesUtil.setAppProperties(this, appProperties) // Restart the current activity - relaunchCurrentScreen() + reloadActivity() Toast.makeText(this, R.string.success_import_app_properties, Toast.LENGTH_LONG).show() } }