From 7ef41c0169bbdf98bbb524892ea8baf13aa4aaa0 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 9 Feb 2022 11:03:42 -0500
Subject: [PATCH] Inline the voice note recording V2 feature flag.

---
 .../org/thoughtcrime/securesms/audio/AudioRecorder.java   | 2 +-
 .../org/thoughtcrime/securesms/util/FeatureFlags.java     | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
index d320efded..b3570b1ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
@@ -52,7 +52,7 @@ public class AudioRecorder {
                                  .withMimeType(MediaUtil.AUDIO_AAC)
                                  .createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
 
-        recorder = Build.VERSION.SDK_INT >= 26 && FeatureFlags.voiceNoteRecordingV2() ? new MediaRecorderWrapper() : new AudioCodec();
+        recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
         recorder.start(fds[1]);
       } catch (IOException e) {
         Log.w(TAG, e);
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 a61a5fb91..d743b4f29 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -88,7 +88,6 @@ public final class FeatureFlags {
   private static final String DONOR_BADGES                      = "android.donorBadges.6";
   private static final String DONOR_BADGES_DISPLAY              = "android.donorBadges.display.4";
   private static final String CDSH                              = "android.cdsh";
-  private static final String VOICE_NOTE_RECORDING_V2           = "android.voiceNoteRecordingV2.2";
   private static final String HARDWARE_AEC_MODELS               = "android.calling.hardwareAecModels";
   private static final String FORCE_DEFAULT_AEC                 = "android.calling.forceDefaultAec";
 
@@ -132,7 +131,6 @@ public final class FeatureFlags {
       DONOR_BADGES,
       DONOR_BADGES_DISPLAY,
       CHANGE_NUMBER_ENABLED,
-      VOICE_NOTE_RECORDING_V2,
       HARDWARE_AEC_MODELS,
       FORCE_DEFAULT_AEC
   );
@@ -189,7 +187,6 @@ public final class FeatureFlags {
       SENDER_KEY_MAX_AGE,
       DONOR_BADGES_DISPLAY,
       DONATE_MEGAPHONE,
-      VOICE_NOTE_RECORDING_V2,
       FORCE_DEFAULT_AEC
   );
 
@@ -435,11 +432,6 @@ public final class FeatureFlags {
     return Environment.IS_STAGING && getBoolean(CDSH, false);
   }
 
-  /** Whether or not to use the new voice note recorder backed by MediaRecorder. */
-  public static boolean voiceNoteRecordingV2() {
-    return getBoolean(VOICE_NOTE_RECORDING_V2, false);
-  }
-
   /** A comma-separated list of models that should use hardware AEC for calling. */
   public static @NonNull String hardwareAecModels() {
     return getString(HARDWARE_AEC_MODELS, "");