From ac97529c73770838624f1c06348b3457cd9ec734 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 9 Apr 2024 08:21:41 +0930 Subject: [PATCH] Remove unnecessary shared pref --- .../org/thoughtcrime/securesms/ApplicationContext.java | 4 ++-- .../org/thoughtcrime/securesms/home/HomeActivity.kt | 2 +- .../securesms/onboarding/LoadingActivity.kt | 3 ++- .../onboarding/pickname/PickDisplayNameActivity.kt | 3 ++- .../libsession/utilities/TextSecurePreferences.kt | 10 ---------- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 79c98e6b99..5b4ef790bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -154,6 +154,8 @@ public class ApplicationContext extends Application implements DefaultLifecycleO private volatile boolean isAppVisible; + public boolean newAccount = false; + @Override public Object getSystemService(String name) { if (MessagingModuleConfiguration.MESSAGING_MODULE_SERVICE.equals(name)) { @@ -213,8 +215,6 @@ public class ApplicationContext extends Application implements DefaultLifecycleO MessagingModuleConfiguration.configure(this); super.onCreate(); - textSecurePreferences.setNewAccount(false); - messagingModuleConfiguration = new MessagingModuleConfiguration( this, storage, diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt index 570b477824..67400a7a81 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt @@ -225,7 +225,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), } // Set up empty state view - binding.emptyStateContainer.setContent { EmptyView(textSecurePreferences.isNewAccount()) } + binding.emptyStateContainer.setContent { EmptyView(ApplicationContext.getInstance(this).newAccount) } IP2Country.configureIfNeeded(this@HomeActivity) startObservingUpdates() diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt index 81df868c61..b37cdc16d7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingActivity.kt @@ -25,6 +25,7 @@ import kotlinx.coroutines.launch import network.loki.messenger.R import org.session.libsession.utilities.AppTextSecurePreferences import org.session.libsession.utilities.TextSecurePreferences +import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.dependencies.ConfigFactory import org.thoughtcrime.securesms.onboarding.messagenotifications.startPNModeActivity @@ -67,7 +68,7 @@ class LoadingActivity: BaseActionBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - prefs.setNewAccount(false) + ApplicationContext.getInstance(this).newAccount = false ComposeView(this) .apply { setContent { LoadingScreen() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt index 720260e7a7..e6a0993222 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt @@ -32,6 +32,7 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import network.loki.messenger.R import org.session.libsession.utilities.AppTextSecurePreferences +import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.onboarding.messagenotifications.startPNModeActivity import org.thoughtcrime.securesms.ui.AppTheme @@ -138,7 +139,7 @@ class PickDisplayNameActivity : BaseActionBarActivity() { } fun Context.startPickDisplayNameActivity(failedToLoad: Boolean = false, flags: Int = 0) { - AppTextSecurePreferences(this).setNewAccount(!failedToLoad) + ApplicationContext.getInstance(this).newAccount = !failedToLoad Intent(this, PickDisplayNameActivity::class.java) .apply { putExtra(EXTRA_PICK_NEW_NAME, failedToLoad) } diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt index 8feb00f6aa..ce5564fb0c 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt @@ -19,7 +19,6 @@ import org.session.libsession.utilities.TextSecurePreferences.Companion.CLASSIC_ import org.session.libsession.utilities.TextSecurePreferences.Companion.CLASSIC_LIGHT import org.session.libsession.utilities.TextSecurePreferences.Companion.FOLLOW_SYSTEM_SETTINGS import org.session.libsession.utilities.TextSecurePreferences.Companion.HIDE_PASSWORD -import org.session.libsession.utilities.TextSecurePreferences.Companion.NEW_ACCOUNT import org.session.libsession.utilities.TextSecurePreferences.Companion.LAST_VACUUM_TIME import org.session.libsession.utilities.TextSecurePreferences.Companion.LEGACY_PREF_KEY_SELECTED_UI_MODE import org.session.libsession.utilities.TextSecurePreferences.Companion.OCEAN_DARK @@ -187,8 +186,6 @@ interface TextSecurePreferences { fun clearAll() fun getHidePassword(): Boolean fun setHidePassword(value: Boolean) - fun isNewAccount(): Boolean - fun setNewAccount(value: Boolean) companion object { val TAG = TextSecurePreferences::class.simpleName @@ -291,7 +288,6 @@ interface TextSecurePreferences { const val SELECTED_STYLE = "pref_selected_style" // classic_dark/light, ocean_dark/light const val FOLLOW_SYSTEM_SETTINGS = "pref_follow_system" // follow system day/night const val HIDE_PASSWORD = "pref_hide_password" - const val NEW_ACCOUNT = "new_account" const val LEGACY_PREF_KEY_SELECTED_UI_MODE = "SELECTED_UI_MODE" // this will be cleared upon launching app, for users migrating to theming build const val CLASSIC_DARK = "classic.dark" @@ -1726,10 +1722,4 @@ class AppTextSecurePreferences @Inject constructor( override fun setHidePassword(value: Boolean) { setBooleanPreference(HIDE_PASSWORD, value) } - - override fun isNewAccount(): Boolean = getBooleanPreference(NEW_ACCOUNT, false) - - override fun setNewAccount(value: Boolean) { - setBooleanPreference(NEW_ACCOUNT, value) - } }