diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2023-02-28 20:42:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 20:42:46 +0100 |
| commit | 5e75c968ad146c6969db98d53be126c7bb74d5e3 (patch) | |
| tree | c1b08dbf3ec9ac4be2c569868aa24824b5d60eb7 /app/src/main/java | |
| parent | ebcb5e2a7c83c16560b0b9851dda01b2d7717d16 (diff) | |
| download | AntennaPod-5e75c968ad146c6969db98d53be126c7bb74d5e3.zip | |
Re-add setting to open drawer when pressing back (#6355)
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 6 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index 6b2267926..6782e9274 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -493,7 +493,11 @@ public class MainActivity extends CastEnabledActivity { String toPage = UserPreferences.getDefaultPage(); if (NavDrawerFragment.getLastNavFragment(this).equals(toPage) || UserPreferences.DEFAULT_PAGE_REMEMBER.equals(toPage)) { - super.onBackPressed(); + if (UserPreferences.backButtonOpensDrawer() && drawerLayout != null) { + drawerLayout.openDrawer(navDrawer); + } else { + super.onBackPressed(); + } } else { loadFragment(toPage, null); } diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java index e093c067d..f6bb286f9 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java @@ -133,5 +133,10 @@ public class PreferenceUpgrader { "" + UserPreferences.EPISODE_CACHE_SIZE_UNLIMITED).apply(); } } + if (oldVersion < 3000007) { + if (prefs.getString("prefBackButtonBehavior", "").equals("drawer")) { + prefs.edit().putBoolean(UserPreferences.PREF_BACK_OPENS_DRAWER, true).apply(); + } + } } } |