From 6589f154c6605ae810498d1174d60b6ea755e905 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 3 Nov 2014 18:45:36 +0300 Subject: fix logout remove all the sidebar shit from onbackpressed becase ughh eghh aghhh --- .../src/main/java/org/fox/ttrss/FeedsActivity.java | 18 ++++++++---------- .../org/fox/ttrss/offline/OfflineFeedsActivity.java | 11 +---------- 2 files changed, 9 insertions(+), 20 deletions(-) (limited to 'org.fox.ttrss/src/main') 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 415e60da..622fdda3 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 @@ -278,16 +278,14 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe public void onCatSelected(FeedCategory cat) { onCatSelected(cat, m_prefs.getBoolean("browse_cats_like_feeds", false)); } - - @Override - public void onBackPressed() { - if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START)) { - m_drawerLayout.openDrawer(Gravity.START); - } else { - super.onBackPressed(); - } - } - + + @Override + public void logout() { + super.logout(); + + finish(); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { if (m_drawerToggle != null && m_drawerToggle.onOptionsItemSelected(item)) { 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 e753424f..7decee7b 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 @@ -120,16 +120,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead startActivityForResult(intent, 0); } } - - @Override - public void onBackPressed() { - if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START)) { - m_drawerLayout.openDrawer(Gravity.START); - } else { - super.onBackPressed(); - } - } - + @Override public boolean onOptionsItemSelected(MenuItem item) { if (m_drawerToggle != null && m_drawerToggle.onOptionsItemSelected(item)) { -- cgit v1.2.3