Merge pull request #3637 from ByteHamster/remove-prestissimo

Removed prestissimo

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]
 ```

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

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" />
-    <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"

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)
+        if (UserPreferences.useSonic()
-                || UserPreferences.useSonic()
                 || UserPreferences.useExoplayer()
                 || Build.VERSION.SDK_INT >= 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();
     }

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())
+        return UserPreferences.useSonic()
-                || UserPreferences.useSonic()
                 || UserPreferences.useExoplayer()
                 || Build.VERSION.SDK_INT >= 23
                 || (playbackService != null && playbackService.canSetSpeed());

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>