diff options
| author | TacoTheDank <SkytkRSfan3895@gmail.com> | 2020-05-29 14:56:35 -0400 |
|---|---|---|
| committer | TacoTheDank <SkytkRSfan3895@gmail.com> | 2020-07-11 20:06:19 -0400 |
| commit | 37f9c08fd9d6a605bfcc393fe74a31a596671596 (patch) | |
| tree | 45605fe47645dc7792c830747e69fdb9782b5311 /core | |
| parent | a17f24912f262c79d1822e3df389ab08d4cb0273 (diff) | |
| download | AntennaPod-37f9c08fd9d6a605bfcc393fe74a31a596671596.zip | |
Fix duplicate branches
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 4 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 6 |
2 files changed, 4 insertions, 6 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 876251563..597d88787 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 @@ -826,8 +826,8 @@ public class UserPreferences { public static VideoBackgroundBehavior getVideoBackgroundBehavior() { switch (prefs.getString(PREF_VIDEO_BEHAVIOR, "pip")) { case "stop": return VideoBackgroundBehavior.STOP; - case "pip": return VideoBackgroundBehavior.PICTURE_IN_PICTURE; case "continue": return VideoBackgroundBehavior.CONTINUE_PLAYING; + case "pip": //Deliberate fall-through default: return VideoBackgroundBehavior.PICTURE_IN_PICTURE; } } @@ -977,11 +977,11 @@ public class UserPreferences { public static BackButtonBehavior getBackButtonBehavior() { switch (prefs.getString(PREF_BACK_BUTTON_BEHAVIOR, "default")) { - case "default": return BackButtonBehavior.DEFAULT; case "drawer": return BackButtonBehavior.OPEN_DRAWER; case "doubletap": return BackButtonBehavior.DOUBLE_TAP; case "prompt": return BackButtonBehavior.SHOW_PROMPT; case "page": return BackButtonBehavior.GO_TO_PAGE; + case "default": // Deliberate fall-through default: return BackButtonBehavior.DEFAULT; } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index fd894796b..fbf061966 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -1140,13 +1140,11 @@ public class PlaybackService extends MediaBrowserServiceCompat { case INITIALIZING: state = PlaybackStateCompat.STATE_CONNECTING; break; - case INITIALIZED: - case INDETERMINATE: - state = PlaybackStateCompat.STATE_NONE; - break; case ERROR: state = PlaybackStateCompat.STATE_ERROR; break; + case INITIALIZED: // Deliberate fall-through + case INDETERMINATE: default: state = PlaybackStateCompat.STATE_NONE; break; |