summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java')
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java47
1 files changed, 11 insertions, 36 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index 8c7538a7..1a228c48 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -95,26 +95,16 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
hf.setSearchQuery(searchQuery);
ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES);
- ft.replace(R.id.article_fragment, new LoadingFragment(), null);
- ft.commit();
-
- setTitle(feed.title);
+ ArticlePager af = new ArticlePager();
+ af.initialize(article != null ? hf.getArticleById(article.id) : new Article(), feed, m_articles);
+ af.setSearchQuery(searchQuery);
- new Handler().postDelayed(new Runnable() {
- @Override
- public void run() {
- FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+ ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
- ArticlePager af = new ArticlePager();
- af.initialize(article != null ? hf.getArticleById(article.id) : new Article(), feed, m_articles);
- af.setSearchQuery(searchQuery);
-
- ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
-
- ft.commit();
- }
- }, 100);
+ ft.commit();
+
+ setTitle(feed.title);
}
}
}
@@ -286,26 +276,11 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
FragmentTransaction ft = getSupportFragmentManager()
.beginTransaction();
- ft.replace(R.id.article_fragment, new LoadingFragment(), null);
-
- ft.commitAllowingStateLoss();
-
- 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();
+ af.initialize(article, hf.getFeed(), m_articles);
- ArticlePager af = new ArticlePager();
- af.initialize(fArticle, fFeed, m_articles);
-
- ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
- ft.commitAllowingStateLoss();
- }
- }, 10);
+ ft.replace(R.id.article_fragment, af, FRAG_ARTICLE);
+ ft.commitAllowingStateLoss();
}
}
}