From 5e75c968ad146c6969db98d53be126c7bb74d5e3 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Tue, 28 Feb 2023 20:42:46 +0100 Subject: Re-add setting to open drawer when pressing back (#6355) --- .../de/danoeh/antennapod/storage/preferences/UserPreferences.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'storage/preferences/src') diff --git a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java index 895d0ab6f..4d2e7394f 100644 --- a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java +++ b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java @@ -63,6 +63,7 @@ public class UserPreferences { public static final String PREF_DEFAULT_PAGE = "prefDefaultPage"; public static final String PREF_FILTER_FEED = "prefSubscriptionsFilter"; public static final String PREF_SUBSCRIPTION_TITLE = "prefSubscriptionTitle"; + public static final String PREF_BACK_OPENS_DRAWER = "prefBackButtonOpensDrawer"; public static final String PREF_QUEUE_KEEP_SORTED = "prefQueueKeepSorted"; public static final String PREF_QUEUE_KEEP_SORTED_ORDER = "prefQueueKeepSortedOrder"; @@ -869,6 +870,10 @@ public class UserPreferences { prefs.edit().putString(PREF_DEFAULT_PAGE, defaultPage).apply(); } + public static boolean backButtonOpensDrawer() { + return prefs.getBoolean(PREF_BACK_OPENS_DRAWER, false); + } + public static boolean timeRespectsSpeed() { return prefs.getBoolean(PREF_TIME_RESPECTS_SPEED, false); } -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0 From 6b6753ad84d42bd0cf0b7225241594b694c4f10d Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Mon, 6 Mar 2023 22:08:49 +0100 Subject: Hide 'reconnect' settings (#6367) Android 12+ doesn't let us start the foreground service from an event like "headset reconnected". Hide the corresponding settings and avoid crashing. --- .../de/danoeh/antennapod/storage/preferences/UserPreferences.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'storage/preferences/src') diff --git a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java index 4d2e7394f..14fb94018 100644 --- a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java +++ b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java @@ -71,7 +71,7 @@ public class UserPreferences { // Playback public static final String PREF_PAUSE_ON_HEADSET_DISCONNECT = "prefPauseOnHeadsetDisconnect"; public static final String PREF_UNPAUSE_ON_HEADSET_RECONNECT = "prefUnpauseOnHeadsetReconnect"; - private static final String PREF_UNPAUSE_ON_BLUETOOTH_RECONNECT = "prefUnpauseOnBluetoothReconnect"; + public static final String PREF_UNPAUSE_ON_BLUETOOTH_RECONNECT = "prefUnpauseOnBluetoothReconnect"; public static final String PREF_HARDWARE_FORWARD_BUTTON = "prefHardwareForwardButton"; public static final String PREF_HARDWARE_PREVIOUS_BUTTON = "prefHardwarePreviousButton"; public static final String PREF_FOLLOW_QUEUE = "prefFollowQueue"; @@ -81,7 +81,6 @@ public class UserPreferences { public static final String PREF_SMART_MARK_AS_PLAYED_SECS = "prefSmartMarkAsPlayedSecs"; private static final String PREF_PLAYBACK_SPEED_ARRAY = "prefPlaybackSpeedArray"; public static final String PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS = "prefPauseForFocusLoss"; - private static final String PREF_RESUME_AFTER_CALL = "prefResumeAfterCall"; private static final String PREF_TIME_RESPECTS_SPEED = "prefPlaybackTimeRespectsSpeed"; public static final String PREF_STREAM_OVER_DOWNLOAD = "prefStreamOverDownload"; @@ -615,10 +614,6 @@ public class UserPreferences { return new ProxyConfig(type, host, port, username, password); } - public static boolean shouldResumeAfterCall() { - return prefs.getBoolean(PREF_RESUME_AFTER_CALL, true); - } - public static boolean isQueueLocked() { return prefs.getBoolean(PREF_QUEUE_LOCKED, false); } -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0