From fbdf6d846b613e5ea6e76f6daf55d37412f2b4b7 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Tue, 12 Oct 2021 21:41:36 +0200
Subject: [PATCH] Cleanup dead code paths

---
 .../ultrasonic/fragment/SettingsFragment.java | 19 -------------------
 .../ultrasonic/service/LocalMediaPlayer.kt    |  6 +-----
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java
index 4be972db..fc5802ab 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java
@@ -144,7 +144,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
         setupServersCategory();
         sharingDefaultGreeting.setText(Settings.getShareGreeting());
         setupClearSearchPreference();
-        setupGaplessControlSettingsV14();
         setupFeatureFlagsPreferences();
         setupCacheLocationPreference();
         setupBluetoothDevicePreferences();
@@ -375,24 +374,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 
     }
 
-    private void setupGaplessControlSettingsV14() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-            PreferenceCategory playbackControlSettings =
-                    findPreference(Constants.PREFERENCES_KEY_PLAYBACK_CONTROL_SETTINGS);
-            CheckBoxPreference gaplessPlaybackEnabled =
-                    findPreference(Constants.PREFERENCES_KEY_GAPLESS_PLAYBACK);
-
-            if (gaplessPlaybackEnabled != null) {
-                gaplessPlaybackEnabled.setChecked(false);
-                gaplessPlaybackEnabled.setEnabled(false);
-
-                if (playbackControlSettings != null) {
-                    playbackControlSettings.removePreference(gaplessPlaybackEnabled);
-                }
-            }
-        }
-    }
-
     private void setupServersCategory() {
         addServerPreference.setPersistent(false);
         addServerPreference.setTitle(getResources().getString(R.string.settings_server_manage_servers));
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt
index ef44886a..d30b5d00 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt
@@ -485,11 +485,7 @@ class LocalMediaPlayer : KoinComponent {
                 try {
                     setNextPlayerState(PlayerState.PREPARED)
                     if (Settings.gaplessPlayback &&
-                        Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN &&
-                        (
-                            playerState === PlayerState.STARTED ||
-                                playerState === PlayerState.PAUSED
-                            )
+                        (playerState === PlayerState.STARTED || playerState === PlayerState.PAUSED)
                     ) {
                         mediaPlayer.setNextMediaPlayer(nextMediaPlayer)
                         nextSetup = true