From 4abb1695688c7c8bcb46a1900827dab995ee6463 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 16 Mar 2022 14:49:37 -0400
Subject: [PATCH] Do not suggest SMS during onboarding.

---
 .../thoughtcrime/securesms/keyvalue/OnboardingValues.java   | 6 +++---
 .../securesms/megaphone/OnboardingMegaphoneView.java        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java
index 1d845f00e2..43e52de595 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java
@@ -47,7 +47,7 @@ public final class OnboardingValues extends SignalStoreValues {
   public boolean hasOnboarding(@NonNull Context context) {
     return shouldShowNewGroup()      ||
            shouldShowInviteFriends() ||
-           shouldShowSms(context)    ||
+           shouldShowSms()           ||
            shouldShowAppearance()    ||
            shouldShowAddPhoto();
   }
@@ -72,8 +72,8 @@ public final class OnboardingValues extends SignalStoreValues {
     putBoolean(SHOW_SMS, value);
   }
 
-  public boolean shouldShowSms(@NonNull Context context) {
-    return getBoolean(SHOW_SMS, false) && !Util.isDefaultSmsProvider(context) && LocaleFeatureFlags.shouldSuggestSms();
+  public boolean shouldShowSms() {
+    return false;
   }
 
   public void setShowAppearance(boolean value) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
index c5938eb35e..fbc1e9f951 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
@@ -148,7 +148,7 @@ public class OnboardingMegaphoneView extends FrameLayout {
         data.add(TYPE_APPEARANCE);
       }
 
-      if (SignalStore.onboarding().shouldShowSms(context)) {
+      if (SignalStore.onboarding().shouldShowSms()) {
         data.add(TYPE_SMS);
       }