diff options
| author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-11-22 22:18:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 22:18:04 +0100 |
| commit | f3008f442eaf978c5fe9f220301b9836c2aeea10 (patch) | |
| tree | 146b6e38269e9a4b565cb011369a101120bd7133 /core/src/main | |
| parent | e98f578081a736d79769c847c7092b24ccdabd4d (diff) | |
| parent | bf5705b17ae59938a7ba4b52ab6e04cba2dc0e53 (diff) | |
| download | AntennaPod-f3008f442eaf978c5fe9f220301b9836c2aeea10.zip | |
Merge pull request #3636 from ByteHamster/api-16
Bumped minimum API version to 16
Diffstat (limited to 'core/src/main')
3 files changed, 2 insertions, 14 deletions
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/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> |