diff options
| author | Andrew Dolgov <[email protected]> | 2014-11-08 02:32:05 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-11-08 02:32:05 +0300 |
| commit | b171b64d511d92c81b258e7ac095a531178e6157 (patch) | |
| tree | 5969a1f787d0413ef08ab20995e0b858c1ceaa60 /org.fox.ttrss/src/main/java | |
| parent | a509415720d059d59d35d83750c78d25b35256cb (diff) | |
revert to previous back button handling but check whether backstack is not empty to prevent inability to exit the app
Diffstat (limited to 'org.fox.ttrss/src/main/java')
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java | 8 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java index ad63eeee..ad959b48 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java @@ -378,7 +378,13 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe @Override public void onBackPressed() { - finish(); + if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START) && + getSupportFragmentManager().getBackStackEntryCount() > 0) { + + m_drawerLayout.openDrawer(Gravity.START); + } else { + super.onBackPressed(); + } } @Override diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java index 89010584..382d6baf 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java @@ -264,7 +264,13 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead @Override public void onBackPressed() { - finish(); + if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START) && + getSupportFragmentManager().getBackStackEntryCount() > 0) { + + m_drawerLayout.openDrawer(Gravity.START); + } else { + super.onBackPressed(); + } } public void onFeedSelected(int feedId) { |