summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-05-28 10:38:59 +0400
committerAndrew Dolgov <[email protected]>2013-05-28 10:38:59 +0400
commit339f37e5b099efffac72aee2f7cb77de46e3d2e4 (patch)
tree164adf0c70b94837b2e302e9ffa87deacb5e0688 /src
parent4e412ef05beae46659af3b99a504f8ed8b7b1e0a (diff)
fix revertdepth not decreasing properly on backpressed
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/FeedsActivity.java22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java
index 060d4ebd..d462e438 100644
--- a/src/org/fox/ttrss/FeedsActivity.java
+++ b/src/org/fox/ttrss/FeedsActivity.java
@@ -297,7 +297,14 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
@Override
public void onBackPressed() {
- if (m_slidingMenu != null && !m_slidingMenu.isMenuShowing()) {
+ if (m_actionbarRevertDepth > 0) {
+
+ m_actionbarRevertDepth = m_actionbarRevertDepth - 1;
+ m_actionbarUpEnabled = m_actionbarRevertDepth > 0;
+ getSupportActionBar().setDisplayHomeAsUpEnabled(m_actionbarUpEnabled);
+
+ onBackPressed();
+ } else if (m_slidingMenu != null && !m_slidingMenu.isMenuShowing()) {
m_slidingMenu.showMenu();
} else {
super.onBackPressed();
@@ -308,18 +315,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
- if (m_actionbarRevertDepth > 0) {
-
- m_actionbarRevertDepth = m_actionbarRevertDepth - 1;
- m_actionbarUpEnabled = m_actionbarRevertDepth > 0;
- getSupportActionBar().setDisplayHomeAsUpEnabled(m_actionbarUpEnabled);
-
- onBackPressed();
- } else if (m_slidingMenu != null && !m_slidingMenu.isMenuShowing()) {
- m_slidingMenu.showMenu();
- } else {
- finish();
- }
+ onBackPressed();
return true;
case R.id.show_feeds:
setUnreadOnly(!getUnreadOnly());