Merge pull request #2655 from ByteHamster/exo-player

Added ExoPlayer

2 files changed, 6 insertions, 12 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
index 6a975fe49..cf9a2907b 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
@@ -52,7 +52,7 @@ public class VariableSpeedDialog {
         builder.neutralText(R.string.close_label);
         builder.onPositive((dialog, which) -> {
             if (Build.VERSION.SDK_INT >= 16) { // just to be safe
-                UserPreferences.enableSonic(true);
+                UserPreferences.enableSonic();
                 if(showSpeedSelector) {
                     showSpeedSelectorDialog(context);
                 }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 9bb0edeb2..29bbee980 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -147,12 +147,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if(key.equals(UserPreferences.PREF_SONIC)) {
-            CheckBoxPreference prefSonic = (CheckBoxPreference) ui.findPreference(UserPreferences.PREF_SONIC);
-            if(prefSonic != null) {
-                prefSonic.setChecked(sharedPreferences.getBoolean(UserPreferences.PREF_SONIC, false));
-            }
-        }
+
     }
 
 
@@ -891,11 +886,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     private void checkSonicItemVisibility() {
-        if (Build.VERSION.SDK_INT >= 16) {
-            ui.findPreference(UserPreferences.PREF_SONIC).setEnabled(true);
-        } else {
-            Preference prefSonic = ui.findPreference(UserPreferences.PREF_SONIC);
-            prefSonic.setSummary("[Android 4.1+]\n" + prefSonic.getSummary());
+        if (Build.VERSION.SDK_INT < 16) {
+            ListPreference p = (ListPreference) ui.findPreference(UserPreferences.PREF_MEDIA_PLAYER);
+            p.setEntries(R.array.media_player_options_no_sonic);
+            p.setEntryValues(R.array.media_player_values_no_sonic);
         }
     }