Merge branch 'develop' into remove-prestissimo

5 files changed, 6 insertions, 20 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 708bea7d6..a928f3529 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -304,7 +304,7 @@ public class UserPreferences {
     }
 
     public enum EnqueueLocation {
-        BACK, FRONT, AFTER_CURRENTLY_PLAYING;
+        BACK, FRONT, AFTER_CURRENTLY_PLAYING
     }
 
     @NonNull
@@ -566,8 +566,7 @@ public class UserPreferences {
             prefs.edit().putString(PREF_IMAGE_CACHE_SIZE, IMAGE_CACHE_DEFAULT_VALUE).apply();
             cacheSizeInt = Integer.parseInt(IMAGE_CACHE_DEFAULT_VALUE);
         }
-        int cacheSizeMB = cacheSizeInt * 1024 * 1024;
-        return cacheSizeMB;
+        return cacheSizeInt * 1024 * 1024;
     }
 
     public static int getFastForwardSecs() {
@@ -791,8 +790,7 @@ public class UserPreferences {
     }
 
     public static String getMediaPlayer() {
-        String s =  prefs.getString(PREF_MEDIA_PLAYER, "blaah");
-        return s;
+        return prefs.getString(PREF_MEDIA_PLAYER, PREF_MEDIA_PLAYER_EXOPLAYER);
     }
 
     public static boolean useSonic() {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index 2082b95d1..bf990f69d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -142,7 +142,7 @@ public class AntennapodHttpClient {
                 });
             }
         }
-        if (16 <= Build.VERSION.SDK_INT && Build.VERSION.SDK_INT < 21) {
+        if (Build.VERSION.SDK_INT < 21) {
             builder.sslSocketFactory(new CustomSslSocketFactory(), trustManager());
         }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index a37f357ae..1aff73564 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -327,9 +327,7 @@ public class PodDBAdapter {
         SQLiteDatabase newDb;
         try {
             newDb = SingletonHolder.dbHelper.getWritableDatabase();
-            if (Build.VERSION.SDK_INT >= 16) {
-                newDb.disableWriteAheadLogging();
-            }
+            newDb.disableWriteAheadLogging();
         } catch (SQLException ex) {
             Log.e(TAG, Log.getStackTraceString(ex));
             newDb = SingletonHolder.dbHelper.getReadableDatabase();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java b/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java
index 96a18506d..e3a10b14a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/SortOrder.java
@@ -25,7 +25,7 @@ public enum SortOrder {
     SMART_SHUFFLE_NEW_OLD(105, INTER_FEED);
 
     public enum Scope {
-        INTRA_FEED, INTER_FEED;
+        INTRA_FEED, INTER_FEED
     }
 
     public final int code;
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 3a6a45e6d..facde2c59 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -233,16 +233,6 @@
         <item>exoplayer</item>
     </string-array>
 
-    <string-array name="media_player_options_no_sonic">
-        <item>@string/media_player_builtin</item>
-        <item>@string/media_player_exoplayer</item>
-    </string-array>
-
-    <string-array name="media_player_values_no_sonic">
-        <item>builtin</item>
-        <item>exoplayer</item>
-    </string-array>
-
     <string-array name="episode_filter_options">
         <item>@string/hide_unplayed_episodes_label</item>
         <item>@string/hide_paused_episodes_label</item>