diff options
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | app/proguard.cfg | 1 | ||||
| -rw-r--r-- | app/src/main/assets/licenses.xml | 6 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java | 28 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java | 3 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 2 |
6 files changed, 6 insertions, 36 deletions
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 @@ -79,12 +79,6 @@ license="Apache 2.0" licenseText="LICENSE_APACHE-2.0.txt" /> <library - name="Presto Client" - author="aocate" - website="http://www.aocate.com/presto/" - license="Apache 2.0" - licenseText="LICENSE_PRESTO.txt" /> - <library name="RecyclerView-FlexibleDivider" author="yqritc" website="https://github.com/yqritc/RecyclerView-FlexibleDivider" 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 a5c78b511..fab1cdcb2 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java @@ -1,33 +1,21 @@ package de.danoeh.antennapod.dialog; -import android.content.ActivityNotFoundException; import android.content.Context; -import android.content.Intent; -import android.net.Uri; import android.os.Build; import androidx.appcompat.app.AlertDialog; -import android.util.Log; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.preferences.UserPreferences; import java.util.Arrays; import java.util.List; -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.util.IntentUtils; - public class VariableSpeedDialog { - private static final String TAG = VariableSpeedDialog.class.getSimpleName(); - - private static final Intent playStoreIntent = new Intent(Intent.ACTION_VIEW, - Uri.parse("market://details?id=com.falconware.prestissimo")); - private VariableSpeedDialog() { } public static void showDialog(final Context context) { - if (org.antennapod.audio.MediaPlayer.isPrestoLibraryInstalled(context) - || UserPreferences.useSonic() + if (UserPreferences.useSonic() || UserPreferences.useExoplayer() || Build.VERSION.SDK_INT >= 23) { showSpeedSelectorDialog(context); @@ -53,16 +41,6 @@ public class VariableSpeedDialog { } }); } - 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 @@ <!-- Variable Speed --> <string name="download_plugin_label">Download Plugin</string> <string name="no_playback_plugin_title">Plugin Not Installed</string> - <string name="no_playback_plugin_or_sonic_msg">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 <i>Prestissimo</i> from the Play Store.\nAny problems with Prestissimo are not the responsibility of AntennaPod and should be reported to the plugin owner.</string> + <string name="no_playback_plugin_or_sonic_msg">For variable speed playback to work, we recommend to enable the built-in Sonic mediaplayer.</string> <string name="set_playback_speed_label">Playback Speeds</string> <string name="enable_sonic">Enable Sonic</string> |