From c52ea94c4418626847c19bb6346a1e81d536e5ec Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 16 Sep 2012 19:25:47 +0400
Subject: more experimental stuff

---
 src/org/fox/ttrss/HeadlinesActivity.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/org/fox/ttrss/HeadlinesActivity.java')

diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java
index dd2a5a8c..1b9ead10 100644
--- a/src/org/fox/ttrss/HeadlinesActivity.java
+++ b/src/org/fox/ttrss/HeadlinesActivity.java
@@ -64,7 +64,7 @@ private final String TAG = this.getClass().getSimpleName();
 
 				ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES);
 				
-				ArticlePager af = new ArticlePager(article);
+				ArticlePager af = new ArticlePager(article, hf.getAllArticles());
 				
 				ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
 			}
@@ -80,6 +80,7 @@ private final String TAG = this.getClass().getSimpleName();
 		setLoadingStatus(R.string.blank, false);
 		findViewById(R.id.loading_container).setVisibility(View.GONE);
 		
+		initMenu();
 	}
 	
 	@Override
@@ -114,7 +115,7 @@ private final String TAG = this.getClass().getSimpleName();
 	protected void initMenu() {
 		super.initMenu();
 
-		if (m_menu != null) {
+		if (m_menu != null && m_sessionId != null) {
 			m_menu.setGroupVisible(R.id.menu_group_feeds, false);
 
 			HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
@@ -145,7 +146,9 @@ private final String TAG = this.getClass().getSimpleName();
 			FragmentTransaction ft = getSupportFragmentManager()
 					.beginTransaction();
 			
-			Fragment frag = new ArticlePager(article);
+			HeadlinesFragment hf = (HeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
+			
+			Fragment frag = new ArticlePager(article, hf.getAllArticles());
 
 			ft.replace(R.id.article_fragment, frag, FRAG_ARTICLE);
 			//ft.addToBackStack(null);
-- 
cgit v1.2.3-54-g00ecf