Merge branch 'develop' into remove-prestissimo

19 files changed, 46 insertions, 101 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 16c3dcf1b..4e6b8fa29 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod;
 
 import android.app.Application;
-import android.os.Build;
 import android.os.StrictMode;
 
 import com.joanzapata.iconify.Iconify;
@@ -25,45 +24,43 @@ public class PodcastApp extends Application {
         }
     }
 
-	private static PodcastApp singleton;
+    private static PodcastApp singleton;
 
-	public static PodcastApp getInstance() {
-		return singleton;
-	}
+    public static PodcastApp getInstance() {
+        return singleton;
+    }
 
-	@Override
-	public void onCreate() {
-		super.onCreate();
+    @Override
+    public void onCreate() {
+        super.onCreate();
 
-		Thread.setDefaultUncaughtExceptionHandler(new CrashReportWriter());
+        Thread.setDefaultUncaughtExceptionHandler(new CrashReportWriter());
 
-		if(BuildConfig.DEBUG) {
-			StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder()
-				.detectLeakedSqlLiteObjects()
-				.penaltyLog()
-				.penaltyDropBox();
-			builder.detectActivityLeaks();
-			builder.detectLeakedClosableObjects();
-			if(Build.VERSION.SDK_INT >= 16) {
-				builder.detectLeakedRegistrationObjects();
-			}
-			StrictMode.setVmPolicy(builder.build());
-		}
+        if (BuildConfig.DEBUG) {
+            StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder()
+                    .detectLeakedSqlLiteObjects()
+                    .penaltyLog()
+                    .penaltyDropBox()
+                    .detectActivityLeaks()
+                    .detectLeakedClosableObjects()
+                    .detectLeakedRegistrationObjects();
+            StrictMode.setVmPolicy(builder.build());
+        }
 
-		singleton = this;
+        singleton = this;
 
-		ClientConfig.initialize(this);
+        ClientConfig.initialize(this);
 
-		Iconify.with(new FontAwesomeModule());
-		Iconify.with(new MaterialModule());
+        Iconify.with(new FontAwesomeModule());
+        Iconify.with(new MaterialModule());
 
         SPAUtil.sendSPAppsQueryFeedsIntent(this);
-		EventBus.builder()
-				.addIndex(new ApEventBusIndex())
-				.addIndex(new ApCoreEventBusIndex())
-				.logNoSubscriberMessages(false)
-				.sendNoSubscriberEvent(false)
-				.installDefaultEventBus();
+        EventBus.builder()
+                .addIndex(new ApEventBusIndex())
+                .addIndex(new ApCoreEventBusIndex())
+                .logNoSubscriberMessages(false)
+                .sendNoSubscriberEvent(false)
+                .installDefaultEventBus();
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 31b708443..0023e6d7f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -317,8 +317,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
                 fragment = new AddFeedFragment();
                 break;
             case SubscriptionFragment.TAG:
-                SubscriptionFragment subscriptionFragment = new SubscriptionFragment();
-                fragment = subscriptionFragment;
+                fragment = new SubscriptionFragment();
                 break;
             default:
                 // default to the queue
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index d71a0f872..538ed1231 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -391,10 +391,9 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
                     | Intent.FLAG_ACTIVITY_NEW_TASK);
 
             View cover = findViewById(R.id.imgvCover);
-            if (cover != null && Build.VERSION.SDK_INT >= 16) {
-                ActivityOptionsCompat options = ActivityOptionsCompat.
-                        makeSceneTransitionAnimation(MediaplayerActivity.this,
-                        cover, "coverTransition");
+            if (cover != null) {
+                ActivityOptionsCompat options = ActivityOptionsCompat
+                        .makeSceneTransitionAnimation(MediaplayerActivity.this, cover, "coverTransition");
                 startActivity(intent, options.toBundle());
             } else {
                 startActivity(intent);
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 2d28ea561..0c6ae2645 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -151,10 +151,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         videoview.getHolder().addCallback(surfaceHolderCallback);
         videoframe.setOnTouchListener(onVideoviewTouched);
         videoOverlay.setOnTouchListener((view, motionEvent) -> true); // To suppress touches directly below the slider
-
-        if (Build.VERSION.SDK_INT >= 16) {
-            videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
-        }
+        videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         videoOverlay.setFitsSystemWindows(true);
 
         setupVideoControlsToggler();
@@ -351,9 +348,9 @@ public class VideoplayerActivity extends MediaplayerActivity {
                 controls.startAnimation(animation);
             }
         }
-        int videoviewFlag = (Build.VERSION.SDK_INT >= 16) ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0;
-        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | videoviewFlag);
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
+                | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         videoOverlay.setFitsSystemWindows(true);
 
         videoOverlay.setVisibility(View.GONE);
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 fab1cdcb2..ef624ebe6 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
@@ -32,15 +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);
-
-        if (Build.VERSION.SDK_INT >= 16) {
-            builder.setPositiveButton(R.string.enable_sonic, (dialog, which) -> {
-                UserPreferences.enableSonic();
-                if (showSpeedSelector) {
-                    showSpeedSelectorDialog(context);
-                }
-            });
-        }
+        builder.setPositiveButton(R.string.enable_sonic, (dialog, which) -> {
+            UserPreferences.enableSonic();
+            if (showSpeedSelector) {
+                showSpeedSelectorDialog(context);
+            }
+        });
         builder.setNeutralButton(R.string.close_label, null);
         builder.show();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CombinedSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CombinedSearchFragment.java
index 5ab781fe3..47d7a0b86 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CombinedSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CombinedSearchFragment.java
@@ -101,7 +101,6 @@ public class CombinedSearchFragment extends Fragment {
         inflater.inflate(R.menu.itunes_search, menu);
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.search_label));
         sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
index fe48de815..5dbb703b7 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
@@ -169,7 +169,6 @@ public abstract class EpisodesListFragment extends Fragment {
 
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.search_hint));
         sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 5a5bdc081..ce2232a55 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -71,9 +71,9 @@ public class ExternalPlayerFragment extends Fragment {
             if (controller != null && controller.getMedia() != null) {
                 Intent intent = PlaybackService.getPlayerActivityIntent(getActivity(), controller.getMedia());
 
-                if (Build.VERSION.SDK_INT >= 16 && controller.getMedia().getMediaType() == MediaType.AUDIO) {
-                    ActivityOptionsCompat options = ActivityOptionsCompat.
-                            makeSceneTransitionAnimation(getActivity(), imgvCover, "coverTransition");
+                if (controller.getMedia().getMediaType() == MediaType.AUDIO) {
+                    ActivityOptionsCompat options = ActivityOptionsCompat
+                            .makeSceneTransitionAnimation(getActivity(), imgvCover, "coverTransition");
                     startActivity(intent, options.toBundle());
                 } else {
                     startActivity(intent);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index 666ee97e0..f03aef207 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -185,7 +185,6 @@ public class FeedItemlistFragment extends ListFragment {
 
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.search_hint));
         searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
              @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
index a3c3df340..aa26610aa 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FyydSearchFragment.java
@@ -100,7 +100,6 @@ public class FyydSearchFragment extends Fragment {
         inflater.inflate(R.menu.itunes_search, menu);
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.search_fyyd_label));
         sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index a97d60099..85978b761 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -144,7 +144,6 @@ public class ItemDescriptionFragment extends Fragment {
         }
     };
 
-    @SuppressWarnings("deprecation")
     @SuppressLint("NewApi")
     @Override
     public boolean onContextItemSelected(MenuItem item) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
index ca691c2e6..4b1544e47 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
@@ -150,7 +150,6 @@ public class ItunesSearchFragment extends Fragment {
         inflater.inflate(R.menu.itunes_search, menu);
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.search_itunes_label));
         sv.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index e19248a73..b36ce6145 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -288,7 +288,6 @@ public class QueueFragment extends Fragment {
 
             MenuItem searchItem = menu.findItem(R.id.action_search);
             final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-            MenuItemUtils.adjustTextColor(getActivity(), sv);
             sv.setQueryHint(getString(R.string.search_hint));
             sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                 @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index 1d6debbfe..4baa74df6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
@@ -54,7 +54,6 @@ public abstract class PodcastListFragment extends Fragment {
         inflater.inflate(R.menu.gpodder_podcasts, menu);
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.gpodnet_search_hint));
         sv.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
index 60fc1f446..ffe69aa9a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
@@ -50,7 +50,6 @@ public class SearchListFragment extends PodcastListFragment {
         // parent already inflated menu
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.gpodnet_search_hint));
         sv.setQuery(query, false);
         sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
index b5a95bc33..cde8fb3df 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
@@ -40,7 +40,6 @@ public class TagListFragment extends ListFragment {
         inflater.inflate(R.menu.gpodder_podcasts, menu);
         MenuItem searchItem = menu.findItem(R.id.action_search);
         final SearchView sv = (SearchView) MenuItemCompat.getActionView(searchItem);
-        MenuItemUtils.adjustTextColor(getActivity(), sv);
         sv.setQueryHint(getString(R.string.gpodnet_search_hint));
         sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java
index 5d9af14bd..b82bba89b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java
@@ -41,12 +41,6 @@ public class PlaybackPreferencesFragment extends PreferenceFragmentCompat {
         ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.playback_pref);
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        checkSonicItemVisibility();
-    }
-
     private void setupPlaybackScreen() {
         final Activity activity = getActivity();
 
@@ -130,14 +124,4 @@ public class PlaybackPreferencesFragment extends PreferenceFragmentCompat {
         }
         pref.setEntries(entries);
     }
-
-
-
-    private void checkSonicItemVisibility() {
-        if (Build.VERSION.SDK_INT < 16) {
-            ListPreference p = (ListPreference) findPreference(UserPreferences.PREF_MEDIA_PLAYER);
-            p.setEntries(R.array.media_player_options_no_sonic);
-            p.setEntryValues(R.array.media_player_values_no_sonic);
-        }
-    }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
index 4a57726b1..64eb72ee3 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
@@ -2,14 +2,8 @@ package de.danoeh.antennapod.menuhandler;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.os.Build;
-import androidx.appcompat.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.EditText;
-
-import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
@@ -17,18 +11,6 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
  */
 public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuItemUtils {
 
-    public static void adjustTextColor(Context context, SearchView sv) {
-        if(Build.VERSION.SDK_INT < 14) {
-            EditText searchEditText = sv.findViewById(R.id.search_src_text);
-            if (UserPreferences.getTheme() == de.danoeh.antennapod.R.style.Theme_AntennaPod_Dark
-                    || UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
-                searchEditText.setTextColor(Color.WHITE);
-            } else {
-                searchEditText.setTextColor(Color.BLACK);
-            }
-        }
-    }
-
     @SuppressWarnings("ResourceType")
     public static void refreshLockItem(Context context, Menu menu) {
         final MenuItem queueLock = menu.findItem(de.danoeh.antennapod.R.id.queue_lock);
diff --git a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
index e79389fb3..4c116fa2d 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
@@ -88,7 +88,7 @@ public class AspectRatioVideoView extends VideoView {
         mVideoWidth = videoWidth;
         mVideoHeight = videoHeight;
 
-        /**
+        /*
          * If this isn't set the video is stretched across the
          * SurfaceHolders display surface (i.e. the SurfaceHolder
          * as the same size and the video is drawn to fit this