From f1d50cad486eac88aeeda8be8735cb07325186b1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 20 Sep 2012 23:05:34 +0400
Subject: [PATCH] use deferred loading on headlinesactivity refresh, bump
 version

---
 AndroidManifest.xml                      |  4 ++--
 src/org/fox/ttrss/FeedsActivity.java     |  4 +---
 src/org/fox/ttrss/HeadlinesActivity.java | 24 ++++++++++++++++++------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c254e64c..58d006a8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="103"
-    android:versionName="0.8.2" >
+    android:versionCode="104"
+    android:versionName="0.8.3" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java
index ef8ad088..332276b1 100644
--- a/src/org/fox/ttrss/FeedsActivity.java
+++ b/src/org/fox/ttrss/FeedsActivity.java
@@ -152,11 +152,9 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
 			ft.replace(R.id.headlines_fragment, new LoadingFragment(), null);
 			ft.commit();
 			
-			Handler handler = new Handler();
-			
 			final Feed fFeed = feed;
 			
-			handler.postDelayed(new Runnable() {
+			new Handler().postDelayed(new Runnable() {
 				@Override
 				public void run() {
 					FragmentTransaction ft = getSupportFragmentManager()
diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java
index 34cd9d5a..9d1f07fa 100644
--- a/src/org/fox/ttrss/HeadlinesActivity.java
+++ b/src/org/fox/ttrss/HeadlinesActivity.java
@@ -60,9 +60,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
 				
 				setTitle(feed.title);
 
-				Handler handler = new Handler();
-				
-				handler.postDelayed(new Runnable() {
+				new Handler().postDelayed(new Runnable() {
 					@Override
 					public void run() {
 						FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
@@ -191,14 +189,28 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
 
 				hf.setActiveArticle(article);
 
-				ArticlePager af = new ArticlePager(article, hf.getFeed());
-				
 				FragmentTransaction ft = getSupportFragmentManager()
 						.beginTransaction();
 
-				ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
+				ft.replace(R.id.article_fragment, new LoadingFragment(), null);
 				
 				ft.commit();
+				
+				final Article fArticle = article;
+				final Feed fFeed = hf.getFeed();
+				
+				new Handler().postDelayed(new Runnable() {
+					@Override
+					public void run() {
+						FragmentTransaction ft = getSupportFragmentManager()
+								.beginTransaction();
+
+						ArticlePager af = new ArticlePager(fArticle, fFeed);
+
+						ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
+						ft.commit();
+					}
+				}, 10);				
 			}
 		}
 	}