From 064f7abd92ecd0a33786c3db6957bad59e84ffd8 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 24 Oct 2022 16:19:52 -0300
Subject: [PATCH] Remove stories beta dialog.

---
 .../contacts/paged/ContactSearchMediator.kt          | 12 ------------
 .../thoughtcrime/securesms/keyvalue/StoryValues.kt   | 11 +----------
 .../securesms/stories/dialogs/StoryDialogs.kt        |  9 ---------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
index 7ce6d79990..801b3f5c12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
@@ -12,7 +12,6 @@ import io.reactivex.rxjava3.core.Observable
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.groups.SelectionLimits
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.stories.dialogs.StoryDialogs
 import org.thoughtcrime.securesms.stories.settings.custom.PrivateStorySettingsFragment
 import org.thoughtcrime.securesms.stories.settings.my.MyStorySettingsFragment
 import org.thoughtcrime.securesms.stories.settings.privacy.ChooseInitialMyStoryMembershipBottomSheetDialogFragment
@@ -100,17 +99,6 @@ class ContactSearchMediator(
   }
 
   private fun toggleStorySelection(view: View, contactSearchData: ContactSearchData.Story, isSelected: Boolean) {
-    if (SignalStore.storyValues().userHasSeenBetaDialog) {
-      performStoryToggle(view, contactSearchData, isSelected)
-    } else {
-      StoryDialogs.displayBetaDialog(view.context) {
-        SignalStore.storyValues().userHasSeenBetaDialog = true
-        performStoryToggle(view, contactSearchData, isSelected)
-      }
-    }
-  }
-
-  private fun performStoryToggle(view: View, contactSearchData: ContactSearchData.Story, isSelected: Boolean) {
     if (contactSearchData.recipient.isMyStory && !SignalStore.storyValues().userHasBeenNotifiedAboutStories) {
       ChooseInitialMyStoryMembershipBottomSheetDialogFragment.show(fragment.childFragmentManager)
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt
index fcd147ac16..1f7fc72339 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt
@@ -45,11 +45,6 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) {
      */
     private const val USER_HAS_READ_ONBOARDING_STORY = "stories.user.has.read.onboarding"
 
-    /**
-     * Marks whether the user has seen the beta dialog
-     */
-    private const val USER_HAS_SEEN_BETA_DIALOG = "stories.user.has.seen.beta.dialog"
-
     /**
      * Whether or not the user will send and receive viewed receipts for stories
      */
@@ -65,10 +60,8 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) {
     USER_HAS_ADDED_TO_A_STORY,
     USER_HAS_SEEN_FIRST_NAV_VIEW,
     HAS_DOWNLOADED_ONBOARDING_STORY,
-    USER_HAS_SEEN_BETA_DIALOG,
-    STORY_VIEWED_RECEIPTS,
+    USER_HAS_VIEWED_ONBOARDING_STORY,
     USER_HAS_READ_ONBOARDING_STORY,
-    USER_HAS_SEEN_BETA_DIALOG,
     STORY_VIEWED_RECEIPTS
   )
 
@@ -86,8 +79,6 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) {
 
   var userHasReadOnboardingStory: Boolean by booleanValue(USER_HAS_READ_ONBOARDING_STORY, false)
 
-  var userHasSeenBetaDialog: Boolean by booleanValue(USER_HAS_SEEN_BETA_DIALOG, false)
-
   var viewedReceiptsEnabled: Boolean by booleanValue(STORY_VIEWED_RECEIPTS, false)
 
   fun isViewedReceiptsStateSet(): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt
index 5e56c64b57..81f607b6a0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/dialogs/StoryDialogs.kt
@@ -55,15 +55,6 @@ object StoryDialogs {
       .show()
   }
 
-  fun displayBetaDialog(context: Context, onConfirmed: () -> Unit) {
-    MaterialAlertDialogBuilder(context)
-      .setTitle(R.string.StoryDialogs__stories_is_available_to)
-      .setMessage(R.string.StoryDialogs__if_you_share_a_story)
-      .setPositiveButton(R.string.Permissions_continue) { _, _ -> onConfirmed() }
-      .setNegativeButton(android.R.string.cancel) { _, _ -> }
-      .show()
-  }
-
   fun resendStory(context: Context, onDismiss: () -> Unit = {}, resend: () -> Unit) {
   MaterialAlertDialogBuilder(context)
     .setMessage(R.string.StoryDialogs__story_could_not_be_sent)