diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f224dfb2..47a7336cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ How to report a bug 1. Do this 1. Do that -**Environment**: Settings you have changed, e.g. Auto Download. "Unusual" devices you use, e.g. Bluetooth headphones. Do you still use Prestissimo? +**Environment**: Settings you have changed, e.g. Auto Download. "Unusual" devices you use, e.g. Bluetooth headphones. **Stacktrace/Logcat**: [if available] ``` diff --git a/app/proguard.cfg b/app/proguard.cfg index 707530cb6..2551988fd 100644 --- a/app/proguard.cfg +++ b/app/proguard.cfg @@ -9,7 +9,6 @@ -allowaccessmodification -keepattributes *Annotation* -#-injars libs/presto_client-0.8.5.jar -keep public class * extends android.app.Activity -keep public class * extends android.app.Application -keep public class * extends android.app.Service diff --git a/app/src/main/assets/licenses.xml b/app/src/main/assets/licenses.xml index 9fefb2e2c..c69f692cf 100644 --- a/app/src/main/assets/licenses.xml +++ b/app/src/main/assets/licenses.xml @@ -78,12 +78,6 @@ website="https://github.com/square/okio" license="Apache 2.0" licenseText="LICENSE_APACHE-2.0.txt" /> - = 23) { showSpeedSelectorDialog(context); @@ -44,23 +32,12 @@ public class VariableSpeedDialog { AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.no_playback_plugin_title); builder.setMessage(R.string.no_playback_plugin_or_sonic_msg); - builder.setPositiveButton(R.string.enable_sonic, (dialog, which) -> { UserPreferences.enableSonic(); if (showSpeedSelector) { showSpeedSelectorDialog(context); } }); - if (IntentUtils.isCallable(context.getApplicationContext(), playStoreIntent)) { - builder.setNegativeButton(R.string.download_plugin_label, (dialog, which) -> { - try { - context.startActivity(playStoreIntent); - } catch (ActivityNotFoundException e) { - // this is usually thrown on an emulator if the Android market is not installed - Log.e(TAG, Log.getStackTraceString(e)); - } - }); - } builder.setNeutralButton(R.string.close_label, null); builder.show(); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java index beb0a202d..e7f6ad4f1 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java @@ -675,8 +675,7 @@ public class PlaybackController { } public boolean canSetPlaybackSpeed() { - return org.antennapod.audio.MediaPlayer.isPrestoLibraryInstalled(activity.getApplicationContext()) - || UserPreferences.useSonic() + return UserPreferences.useSonic() || UserPreferences.useExoplayer() || Build.VERSION.SDK_INT >= 23 || (playbackService != null && playbackService.canSetSpeed()); diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index f694fbc2e..420fb9d59 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -301,7 +301,7 @@ Download Plugin Plugin Not Installed - For variable speed playback to work, we recommend to enable the built-in Sonic mediaplayer [Android 4.1+].\n\nAlternatively, you can download the third party plugin Prestissimo from the Play Store.\nAny problems with Prestissimo are not the responsibility of AntennaPod and should be reported to the plugin owner. + For variable speed playback to work, we recommend to enable the built-in Sonic mediaplayer. Playback Speeds Enable Sonic