From 0815715f7ba846cdcc744401efd4c6eb92afc6df Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 21 Jul 2020 13:37:29 -0400
Subject: [PATCH] Enable call requests always.

---
 .../thoughtcrime/securesms/service/WebRtcCallService.java  | 2 +-
 .../java/org/thoughtcrime/securesms/util/FeatureFlags.java | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
index 11f4d65405..11a1ca9a9d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
@@ -405,7 +405,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
       return;
     }
 
-    if (FeatureFlags.profileForCalling() && (remotePeer.getRecipient() == null || !RecipientUtil.isMessageRequestAccepted(getApplicationContext(), remotePeer.getRecipient()))) {
+    if (remotePeer.getRecipient() == null || !RecipientUtil.isMessageRequestAccepted(getApplicationContext(), remotePeer.getRecipient())) {
       Log.i(TAG, "handleReceivedOffer(): Caller is untrusted.");
       intent.putExtra(EXTRA_BROADCAST, true);
       intent.putExtra(EXTRA_HANGUP_TYPE, HangupMessage.Type.NEED_PERMISSION.getCode());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 9cae3c138f..5a84273d8d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -52,7 +52,6 @@ public final class FeatureFlags {
   private static final String USERNAMES                  = "android.usernames";
   private static final String ATTACHMENTS_V3             = "android.attachmentsV3.2";
   private static final String REMOTE_DELETE              = "android.remoteDelete";
-  private static final String PROFILE_FOR_CALLING        = "android.profileForCalling.2";
   private static final String GROUPS_V2_OLD              = "android.groupsv2";
   private static final String GROUPS_V2                  = "android.groupsv2.2";
   private static final String GROUPS_V2_CREATE           = "android.groupsv2.create.2";
@@ -68,7 +67,6 @@ public final class FeatureFlags {
   private static final Set<String> REMOTE_CAPABLE = Sets.newHashSet(
       ATTACHMENTS_V3,
       REMOTE_DELETE,
-      PROFILE_FOR_CALLING,
       GROUPS_V2,
       GROUPS_V2_CREATE,
       GROUPS_V2_CAPACITY,
@@ -193,11 +191,6 @@ public final class FeatureFlags {
     return getBoolean(REMOTE_DELETE, false);
   }
 
-  /** Whether or not profile sharing is required for calling */
-  public static boolean profileForCalling() {
-    return getBoolean(PROFILE_FOR_CALLING, false);
-  }
-
   /** Groups v2 send and receive. */
   public static boolean groupsV2() {
     return getBoolean(GROUPS_V2_OLD, false) || getBoolean(GROUPS_V2, false);