From 4660905c09866f6148182f1310c9a4b3fc15c0ba Mon Sep 17 00:00:00 2001 From: bemusementpark Date: Wed, 3 Jul 2024 18:28:12 +0930 Subject: [PATCH] Remove unneeded SEEN_WELCOME_SCREEN_PREF --- .../securesms/ApplicationContext.java | 2 +- .../PassphraseRequiredActionBarActivity.java | 2 -- .../securesms/home/HomeActivity.kt | 1 + .../notifications/BackgroundPollWorker.kt | 2 +- .../notifications/DefaultMessageNotifier.java | 2 +- .../MessageNotificationsActivity.kt | 1 - .../utilities/TextSecurePreferences.kt | 20 ------------------- 7 files changed, 4 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index f84ee3c908..631c8c9bd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -263,7 +263,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO // If the user account hasn't been created or onboarding wasn't finished then don't start // the pollers - if (textSecurePreferences.getLocalNumber() == null || !textSecurePreferences.hasSeenWelcomeScreen()) { + if (textSecurePreferences.getLocalNumber() == null) { return; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index 895b9da32e..dbe7c4a433 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -131,8 +131,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA return STATE_PROMPT_PASSPHRASE; } else if (DatabaseUpgradeActivity.isUpdate(this)) { return STATE_UPGRADE_DATABASE; - } else if (!TextSecurePreferences.hasSeenWelcomeScreen(this)) { - return STATE_WELCOME_SCREEN; } else { return STATE_NORMAL; } 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 3e1348fc4f..e3028ada8a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt @@ -56,6 +56,7 @@ import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.snode.SnodeAPI import org.session.libsession.utilities.Address +import org.session.libsession.utilities.AppTextSecurePreferences import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.ProfilePictureModifiedEvent import org.session.libsession.utilities.TextSecurePreferences diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt index e583fb0ca5..63f6d07da1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt @@ -76,7 +76,7 @@ class BackgroundPollWorker(val context: Context, params: WorkerParameters) : Wor } override fun doWork(): Result { - if (TextSecurePreferences.getLocalNumber(context) == null || !TextSecurePreferences.hasSeenWelcomeScreen(context)) { + if (TextSecurePreferences.getLocalNumber(context) == null) { Log.v(TAG, "User not registered yet.") return Result.failure() } diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index c5f3905b61..5abaee4033 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -271,7 +271,7 @@ public class DefaultMessageNotifier implements MessageNotifier { try { telcoCursor = DatabaseComponent.get(context).mmsSmsDatabase().getUnread(); // TODO: add a notification specific lighter query here - if ((telcoCursor == null || telcoCursor.isAfterLast()) || !TextSecurePreferences.hasSeenWelcomeScreen(context)) + if ((telcoCursor == null || telcoCursor.isAfterLast()) || TextSecurePreferences.getLocalNumber(context) == null) { updateBadge(context, 0); cancelActiveNotifications(context); diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt index f29f3badab..fa23da8fb2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt @@ -42,7 +42,6 @@ class MessageNotificationsActivity : BaseActionBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setUpActionBarSessionLogo() - prefs.setHasSeenWelcomeScreen(true) setComposeContent { MessageNotificationsScreen() } 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 85580929c8..12fdd4ceaf 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt @@ -118,8 +118,6 @@ interface TextSecurePreferences { fun isPassphraseTimeoutEnabled(): Boolean fun getPassphraseTimeoutInterval(): Int fun getLanguage(): String? - fun hasSeenWelcomeScreen(): Boolean - fun setHasSeenWelcomeScreen(value: Boolean) fun isNotificationsEnabled(): Boolean fun getNotificationRingtone(): Uri fun removeNotificationRingtone() @@ -216,7 +214,6 @@ interface TextSecurePreferences { const val THREAD_TRIM_ENABLED = "pref_trim_threads" const val LOCAL_NUMBER_PREF = "pref_local_number" const val REGISTERED_GCM_PREF = "pref_gcm_registered" - const val SEEN_WELCOME_SCREEN_PREF = "pref_seen_welcome_screen" const val UPDATE_APK_REFRESH_TIME_PREF = "pref_update_apk_refresh_time" const val UPDATE_APK_DOWNLOAD_ID = "pref_update_apk_download_id" const val UPDATE_APK_DIGEST = "pref_update_apk_digest" @@ -707,15 +704,6 @@ interface TextSecurePreferences { return getStringPreference(context, LANGUAGE_PREF, "zz") } - @JvmStatic - fun hasSeenWelcomeScreen(context: Context): Boolean { - return getBooleanPreference(context, SEEN_WELCOME_SCREEN_PREF, false) - } - - fun setHasSeenWelcomeScreen(context: Context, value: Boolean) { - setBooleanPreference(context, SEEN_WELCOME_SCREEN_PREF, value) - } - @JvmStatic fun isNotificationsEnabled(context: Context): Boolean { return getBooleanPreference(context, NOTIFICATION_PREF, true) @@ -1341,14 +1329,6 @@ class AppTextSecurePreferences @Inject constructor( return getStringPreference(TextSecurePreferences.LANGUAGE_PREF, "zz") } - override fun hasSeenWelcomeScreen(): Boolean { - return getBooleanPreference(TextSecurePreferences.SEEN_WELCOME_SCREEN_PREF, false) - } - - override fun setHasSeenWelcomeScreen(value: Boolean) { - setBooleanPreference(TextSecurePreferences.SEEN_WELCOME_SCREEN_PREF, value) - } - override fun isNotificationsEnabled(): Boolean { return getBooleanPreference(TextSecurePreferences.NOTIFICATION_PREF, true) }