Remove deprecated media players (#6354)

8 files changed, 14 insertions, 81 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 72442427f..47e7a550a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,7 +125,6 @@ dependencies {
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"
     implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion"
     implementation 'com.leinardi.android:speed-dial:3.2.0'
-    implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
     implementation 'com.github.ByteHamster:SearchPreference:v2.0.0'
     implementation 'com.github.skydoves:balloon:1.4.0'
     implementation 'com.github.xabaras:RecyclerViewSwipeDecorator:1.3'
diff --git a/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java
index 426a30bb8..735cff532 100644
--- a/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java
@@ -4,45 +4,38 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.view.KeyEvent;
-import androidx.preference.PreferenceManager;
 import android.view.View;
-
+import androidx.preference.PreferenceManager;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.LongList;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
+import de.danoeh.antennapod.model.feed.FeedItem;
 import de.danoeh.antennapod.model.feed.FeedItemFilter;
+import de.danoeh.antennapod.model.feed.FeedMedia;
 import de.danoeh.antennapod.model.feed.SortOrder;
 import de.danoeh.antennapod.playback.base.PlayerStatus;
+import de.danoeh.antennapod.storage.preferences.UserPreferences;
+import de.test.antennapod.EspressoTestUtils;
+import de.test.antennapod.IgnoreOnCi;
+import de.test.antennapod.ui.UITestUtils;
 import org.awaitility.Awaitility;
 import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.MainActivity;
-import de.danoeh.antennapod.model.feed.FeedItem;
-import de.danoeh.antennapod.model.feed.FeedMedia;
-import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.storage.preferences.UserPreferences;
-import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.util.LongList;
-import de.danoeh.antennapod.core.util.playback.PlaybackController;
-import de.test.antennapod.EspressoTestUtils;
-import de.test.antennapod.IgnoreOnCi;
-import de.test.antennapod.ui.UITestUtils;
-
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
@@ -69,31 +62,20 @@ import static org.junit.Assert.assertTrue;
  */
 @LargeTest
 @IgnoreOnCi
-@RunWith(Parameterized.class)
 public class PlaybackTest {
     @Rule
     public ActivityTestRule<MainActivity> activityTestRule = new ActivityTestRule<>(MainActivity.class, false, false);
 
-    @Parameterized.Parameter(value = 0)
-    public String playerToUse;
     private UITestUtils uiTestUtils;
     protected Context context;
     private PlaybackController controller;
 
-    @Parameterized.Parameters(name = "{0}")
-    public static Collection<Object[]> initParameters() {
-        return Arrays.asList(new Object[][] { { "exoplayer" }, { "builtin" }, { "sonic" } });
-    }
-
     @Before
     public void setUp() throws Exception {
         context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         EspressoTestUtils.clearPreferences();
         EspressoTestUtils.clearDatabase();
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putString(UserPreferences.PREF_MEDIA_PLAYER, playerToUse).apply();
-
         uiTestUtils = new UITestUtils(context);
         uiTestUtils.setup();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/MediaPlayerErrorDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/MediaPlayerErrorDialog.java
index ab5dde92d..306400b29 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/MediaPlayerErrorDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/MediaPlayerErrorDialog.java
@@ -6,11 +6,9 @@ import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.snackbar.Snackbar;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.event.PlayerErrorEvent;
-import de.danoeh.antennapod.storage.preferences.UserPreferences;
 
 public class MediaPlayerErrorDialog {
     public static void show(Activity activity, PlayerErrorEvent event) {
@@ -25,13 +23,6 @@ public class MediaPlayerErrorDialog {
         errorDialog.setMessage(errorMessage);
         errorDialog.setPositiveButton(android.R.string.ok, (dialog, which) ->
                 ((MainActivity) activity).getBottomSheet().setState(BottomSheetBehavior.STATE_COLLAPSED));
-        if (!UserPreferences.useExoplayer()) {
-            errorDialog.setNeutralButton(R.string.media_player_switch_to_exoplayer, (dialog, which) -> {
-                UserPreferences.enableExoplayer();
-                ((MainActivity) activity).showSnackbarAbovePlayer(
-                        R.string.media_player_switched_to_exoplayer, Snackbar.LENGTH_LONG);
-            });
-        }
         errorDialog.create().show();
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
index cec41fac0..a87dccdf5 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
@@ -63,31 +63,12 @@ public class PlaybackControlsDialog extends DialogFragment {
     }
 
     private void setupUi() {
-        final CheckBox stereoToMono = dialog.findViewById(R.id.stereo_to_mono);
-        stereoToMono.setChecked(UserPreferences.stereoToMono());
-        if (controller != null && !controller.canDownmix()) {
-            stereoToMono.setEnabled(false);
-            String sonicOnly = getString(R.string.sonic_only);
-            stereoToMono.setText(getString(R.string.stereo_to_mono) + " [" + sonicOnly + "]");
-        }
-
         final CheckBox skipSilence = dialog.findViewById(R.id.skipSilence);
         skipSilence.setChecked(UserPreferences.isSkipSilence());
-        if (!UserPreferences.useExoplayer()) {
-            skipSilence.setEnabled(false);
-            String exoplayerOnly = getString(R.string.exoplayer_only);
-            skipSilence.setText(getString(R.string.pref_skip_silence_title) + " [" + exoplayerOnly + "]");
-        }
         skipSilence.setOnCheckedChangeListener((buttonView, isChecked) -> {
             UserPreferences.setSkipSilence(isChecked);
             controller.setSkipSilence(isChecked);
         });
-        stereoToMono.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            UserPreferences.stereoToMono(isChecked);
-            if (controller != null) {
-                controller.setDownmix(isChecked);
-            }
-        });
     }
 
     private void setupAudioTracks() {
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
index f38e58e83..875ed347e 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
@@ -57,9 +57,6 @@ public class PreferenceUpgrader {
             }
         }
         if (oldVersion < 1070300) {
-            prefs.edit().putString(UserPreferences.PREF_MEDIA_PLAYER,
-                    UserPreferences.PREF_MEDIA_PLAYER_EXOPLAYER).apply();
-
             if (prefs.getBoolean("prefEnableAutoDownloadOnMobile", false)) {
                 UserPreferences.setAllowMobileAutoDownload(true);
             }
diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml
index dc48006bb..3abb70961 100644
--- a/app/src/main/res/layout/audio_controls.xml
+++ b/app/src/main/res/layout/audio_controls.xml
@@ -32,12 +32,6 @@
             android:layout_height="wrap_content"
             android:text="@string/pref_skip_silence_title" />
 
-        <CheckBox
-            android:id="@+id/stereo_to_mono"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/stereo_to_mono" />
-
     </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml
index 4969215d9..4012595bc 100644
--- a/app/src/main/res/layout/external_player_fragment.xml
+++ b/app/src/main/res/layout/external_player_fragment.xml
@@ -19,7 +19,6 @@
             android:id="@+id/imgvCover"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:contentDescription="@string/media_player"
             android:adjustViewBounds="true"
             android:cropToPadding="true"
             android:maxWidth="96dp"
diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml
index 832f3cfec..b59c9a055 100644
--- a/app/src/main/res/xml/preferences_playback.xml
+++ b/app/src/main/res/xml/preferences_playback.xml
@@ -111,14 +111,4 @@
                 android:summary="@string/pref_skip_keeps_episodes_sum"
                 android:title="@string/pref_skip_keeps_episodes_title"/>
     </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/experimental_pref">
-        <de.danoeh.antennapod.preferences.MaterialListPreference
-                android:defaultValue="exoplayer"
-                android:entries="@array/media_player_options"
-                android:key="prefMediaPlayer"
-                android:title="@string/media_player"
-                android:summary="@string/pref_media_player_message"
-                android:entryValues="@array/media_player_values"/>
-    </PreferenceCategory>
 </PreferenceScreen>