summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-06-22 18:14:49 +0400
committerAndrew Dolgov <[email protected]>2012-06-22 18:14:49 +0400
commit8af33e3d7c85b2da8d72a07ce8837d33bb933585 (patch)
tree895ada757917a915b5ac5d1c091f9ce8b84a1ac6 /src
parent714efd1ed086a18cd231ee2d3d30027a79b35f2d (diff)
offline: properly deselect current category when closing headlines
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/offline/OfflineActivity.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java
index 3164b493..b6070355 100644
--- a/src/org/fox/ttrss/offline/OfflineActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineActivity.java
@@ -333,12 +333,19 @@ public class OfflineActivity extends FragmentActivity implements
OfflineFeedsFragment ff = (OfflineFeedsFragment) getSupportFragmentManager()
.findFragmentByTag(FRAG_FEEDS);
+ OfflineFeedCategoriesFragment cf = (OfflineFeedCategoriesFragment) getSupportFragmentManager()
+ .findFragmentByTag(FRAG_CATS);
+
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(R.id.headlines_fragment, new DummyFragment(), "");
ft.commit();
if (ff != null) {
- ff.setSelectedFeedId(-1);
+ ff.setSelectedFeedId(0);
+ }
+
+ if (cf != null) {
+ cf.setSelectedFeedId(-1);
}
refreshViews();
@@ -814,7 +821,7 @@ public class OfflineActivity extends FragmentActivity implements
if (!m_smallScreenMode) {
getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticleId != 0);
} else {
- getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticleId != 0 || m_activeFeedId != 0);
+ getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticleId != 0 || m_activeFeedId != 0 || m_activeCatId != -1);
}
}
}
@@ -1288,7 +1295,7 @@ public class OfflineActivity extends FragmentActivity implements
ft.replace(R.id.feeds_fragment, new OfflineFeedCategoriesFragment(), FRAG_CATS);
}
ft.commit();
-
+
initMainMenu();
refreshViews();