diff options
| author | Andrew Dolgov <[email protected]> | 2014-11-03 18:45:36 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-11-03 18:45:36 +0300 |
| commit | 6589f154c6605ae810498d1174d60b6ea755e905 (patch) | |
| tree | 759ef9ed209ecda1540aa834f7113d6024408639 /org.fox.ttrss/src/main | |
| parent | b44d895165f5e804eeeed85ca1ba27eecca36d49 (diff) | |
fix logout
remove all the sidebar shit from onbackpressed becase ughh eghh aghhh
Diffstat (limited to 'org.fox.ttrss/src/main')
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java | 18 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java | 11 |
2 files changed, 9 insertions, 20 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 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)) { |