summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-12-04 12:28:59 +0300
committerAndrew Dolgov <[email protected]>2011-12-04 12:28:59 +0300
commit40dcbe61d0d69a5d9646e9793e5ff45534e4ab62 (patch)
tree13f9567120ea58f52d98f2e6e77d2afc79a44c96
parentace19a9427f47dd2f1fe2146b0a629a889e6ed3f (diff)
fix closeArticle() to properly restore cats/feeds view
-rw-r--r--src/org/fox/ttrss/MainActivity.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index f63a1ca3..799d5270 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -737,14 +737,21 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
findViewById(R.id.main).setAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_right));
}
- boolean browseCats = m_prefs.getBoolean("browse_cats_like_feeds", false);
+ //boolean browseCats = m_prefs.getBoolean("browse_cats_like_feeds", false);
if (m_smallScreenMode) {
findViewById(R.id.article_fragment).setVisibility(View.GONE);
findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE);
} else {
findViewById(R.id.article_fragment).setVisibility(View.GONE);
- findViewById(browseCats ? R.id.cats_fragment : R.id.feeds_fragment).setVisibility(View.VISIBLE);
+
+ if (m_activeFeed != null) {
+ if (m_activeFeed.is_cat) {
+ findViewById(R.id.cats_fragment).setVisibility(View.VISIBLE);
+ } else {
+ findViewById(R.id.feeds_fragment).setVisibility(View.VISIBLE);
+ }
+ }
}
m_selectedArticle = null;