Clear some tooltips after restore, remove some legacy ones entirely.

2026-02-25 04:06:14 +00:00 · 2025-09-03 11:23:16 -04:00
parent 08a8c56d5c
commit b44cd5d4c4
8 changed files with 7 additions and 87 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
@@ -55,6 +55,8 @@ public final class AppInitialization {
    SignalStore.onPostBackupRestore();
    SignalStore.onFirstEverAppLaunch();
    SignalStore.onboarding().clearAll();
+    SignalStore.settings().setPassphraseDisabled(true);
+    SignalStore.notificationProfile().setHasSeenTooltip(true);
    TextSecurePreferences.onPostBackupRestore(context);
    SignalStore.settings().setPassphraseDisabled(true);
    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -1652,11 +1652,6 @@ class ConversationFragment :
      return
    }

-    if (SignalStore.uiHints.hasNotSeenEditMessageBetaAlert()) {
-      Dialogs.showEditMessageBetaDialog(requireContext()) { handleSendEditMessage() }
-      return
-    }
-
    val editMessage = inputPanel.editMessage
    if (editMessage == null) {
      Log.w(TAG, "No edit message found, forcing exit")
@@ -1965,13 +1960,6 @@ class ConversationFragment :
      return
    }

-    if (SignalStore.uiHints.hasNotSeenTextFormattingAlert() && bodyRanges != null && bodyRanges.ranges.isNotEmpty()) {
-      Dialogs.showFormattedTextDialog(requireContext()) {
-        sendMessage(body, mentions, bodyRanges, messageToEdit, quote, scheduledDate, slideDeck, contacts, clearCompose, linkPreviews, preUploadResults, bypassPreSendSafetyNumberCheck, isViewOnce, afterSendComplete)
-      }
-      return
-    }
-
    if (inputPanel.isRecordingInLockedMode) {
      inputPanel.releaseRecordingLockAndSend()
      return
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
@@ -243,6 +243,8 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
    val imageEditor: ImageEditorValues
      get() = instance!!.imageEditorValues

+    @JvmStatic
+    @get:JvmName("notificationProfile")
    val notificationProfile: NotificationProfileValues
      get() = instance!!.notificationProfileValues

--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
@@ -14,8 +14,6 @@ public class UiHintValues extends SignalStoreValues {
  private static final String HAS_SET_OR_SKIPPED_USERNAME_CREATION     = "uihints.has_set_or_skipped_username_creation";
  private static final String NEVER_DISPLAY_PULL_TO_FILTER_TIP         = "uihints.never_display_pull_to_filter_tip";
  private static final String HAS_SEEN_SCHEDULED_MESSAGES_INFO_ONCE    = "uihints.has_seen_scheduled_messages_info_once";
-  private static final String HAS_SEEN_TEXT_FORMATTING_ALERT           = "uihints.text_formatting.has_seen_alert";
-  private static final String HAS_NOT_SEEN_EDIT_MESSAGE_BETA_ALERT     = "uihints.edit_message.has_not_seen_beta_alert";
  private static final String HAS_SEEN_SAFETY_NUMBER_NUX               = "uihints.has_seen_safety_number_nux";
  private static final String DECLINED_NOTIFICATION_LOGS_PROMPT        = "uihints.declined_notification_logs";
  private static final String LAST_NOTIFICATION_LOGS_PROMPT_TIME       = "uihints.last_notification_logs_prompt";
@@ -43,7 +41,7 @@ public class UiHintValues extends SignalStoreValues {

  @Override
  @NonNull List<String> getKeysToIncludeInBackup() {
-    return Arrays.asList(NEVER_DISPLAY_PULL_TO_FILTER_TIP, HAS_COMPLETED_USERNAME_ONBOARDING, HAS_SEEN_TEXT_FORMATTING_ALERT, HAS_EVER_ENABLED_REMOTE_BACKUPS);
+    return Arrays.asList(NEVER_DISPLAY_PULL_TO_FILTER_TIP, HAS_COMPLETED_USERNAME_ONBOARDING, HAS_EVER_ENABLED_REMOTE_BACKUPS);
  }

  public void markHasSeenGroupSettingsMenuToast() {
@@ -103,22 +101,6 @@ public class UiHintValues extends SignalStoreValues {
    return getInteger(NEVER_DISPLAY_PULL_TO_FILTER_TIP, 0);
  }

-  public boolean hasNotSeenTextFormattingAlert() {
-    return getBoolean(HAS_SEEN_TEXT_FORMATTING_ALERT, true);
-  }
-
-  public void markHasSeenTextFormattingAlert() {
-    putBoolean(HAS_SEEN_TEXT_FORMATTING_ALERT, false);
-  }
-
-  public boolean hasNotSeenEditMessageBetaAlert() {
-    return getBoolean(HAS_NOT_SEEN_EDIT_MESSAGE_BETA_ALERT, true);
-  }
-
-  public void markHasSeenEditMessageBetaAlert() {
-    putBoolean(HAS_NOT_SEEN_EDIT_MESSAGE_BETA_ALERT, false);
-  }
-
  public boolean hasSeenSafetyNumberUpdateNux() {
    return getBoolean(HAS_SEEN_SAFETY_NUMBER_NUX, false);
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
@@ -19,12 +19,10 @@ import org.thoughtcrime.securesms.keyboard.KeyboardPage
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerViewModel
 import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageFragment
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment
-import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stories.viewer.page.StoryViewerPageViewModel
 import org.thoughtcrime.securesms.stories.viewer.reply.composer.StoryReplyComposer
-import org.thoughtcrime.securesms.util.Dialogs
 import org.thoughtcrime.securesms.util.ViewUtil

 /**
@@ -84,11 +82,7 @@ class StoryDirectReplyDialogFragment :
            }
        }

-        if (SignalStore.uiHints.hasNotSeenTextFormattingAlert() && composer.input.hasStyling()) {
-          Dialogs.showFormattedTextDialog(requireContext(), sendReply)
-        } else {
-          sendReply.run()
-        }
+        sendReply.run()
      }

      override fun onReactionClicked(emoji: String) {
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt
@@ -45,7 +45,6 @@ import org.thoughtcrime.securesms.jobs.RetrieveProfileJob
 import org.thoughtcrime.securesms.keyboard.KeyboardPage
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerViewModel
 import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardCallback
-import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mediasend.v2.UntrustedRecords
 import org.thoughtcrime.securesms.notifications.v2.ConversationId
 import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment
@@ -58,7 +57,6 @@ import org.thoughtcrime.securesms.stories.viewer.reply.StoryViewsAndRepliesPager
 import org.thoughtcrime.securesms.stories.viewer.reply.StoryViewsAndRepliesPagerParent
 import org.thoughtcrime.securesms.stories.viewer.reply.composer.StoryReplyComposer
 import org.thoughtcrime.securesms.util.DeleteDialog
-import org.thoughtcrime.securesms.util.Dialogs
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.PagingMappingAdapter
@@ -346,11 +344,7 @@ class StoryGroupReplyFragment :
      performSend(body, mentions, bodyRanges)
    }

-    if (SignalStore.uiHints.hasNotSeenTextFormattingAlert() && composer.input.hasStyling()) {
-      Dialogs.showFormattedTextDialog(requireContext(), send)
-    } else {
-      send.run()
-    }
+    send.run()
  }

  override fun onPickAnyReactionClicked() {
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
@@ -44,30 +44,6 @@ public class Dialogs {
        .show();
  }

-  public static void showFormattedTextDialog(@NonNull Context context, @NonNull Runnable onSendAnyway) {
-    new MaterialAlertDialogBuilder(context)
-        .setTitle(R.string.SendingFormattingTextDialog_title)
-        .setMessage(R.string.SendingFormattingTextDialog_message)
-        .setNegativeButton(R.string.SendingFormattingTextDialog_cancel_send_button, null)
-        .setPositiveButton(R.string.SendingFormattingTextDialog_send_anyway_button, (d, w) -> {
-          SignalStore.uiHints().markHasSeenTextFormattingAlert();
-          onSendAnyway.run();
-        })
-        .show();
-  }
-
-  public static void showEditMessageBetaDialog(@NonNull Context context, @NonNull Runnable onSendAnyway) {
-    new MaterialAlertDialogBuilder(context)
-        .setTitle(R.string.SendingEditMessageBetaOnlyDialog_title)
-        .setMessage(R.string.SendingEditMessageBetaOnlyDialog_body)
-        .setNegativeButton(R.string.SendingEditMessageBetaOnlyDialog_cancel, null)
-        .setPositiveButton(R.string.SendingEditMessageBetaOnlyDialog_send, (d, w) -> {
-          SignalStore.uiHints().markHasSeenEditMessageBetaAlert();
-          onSendAnyway.run();
-        })
-        .show();
-  }
-
  public static void showUpgradeSignalDialog(@NonNull Context context) {
    new MaterialAlertDialogBuilder(context)
        .setTitle(R.string.UpdateSignalExpiredDialog__title)