iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix logout

Browse Source 
remove all the sidebar shit from onbackpressed becase ughh eghh aghhh
This commit is contained in:
Andrew Dolgov 2014-11-03 18:45:36 +03:00
parent b44d895165
commit 6589f154c6
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
View File

@ -278,16 +278,14 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
public void onCatSelected(FeedCategory cat) { public void onCatSelected(FeedCategory cat) {
onCatSelected(cat, m_prefs.getBoolean("browse_cats_like_feeds", false)); onCatSelected(cat, m_prefs.getBoolean("browse_cats_like_feeds", false));
} }
@Override @Override
public void onBackPressed() { public void logout() {
if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START)) { super.logout();
m_drawerLayout.openDrawer(Gravity.START);
} else { finish();
super.onBackPressed(); }
}
}
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (m_drawerToggle != null && m_drawerToggle.onOptionsItemSelected(item)) { if (m_drawerToggle != null && m_drawerToggle.onOptionsItemSelected(item)) {

11
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java
View File

@ -120,16 +120,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
startActivityForResult(intent, 0); 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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (m_drawerToggle != null && m_drawerToggle.onOptionsItemSelected(item)) { if (m_drawerToggle != null && m_drawerToggle.onOptionsItemSelected(item)) {