From ad436b13c592454bddd7de2637329f7804ca1b29 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 12 Mar 2018 10:10:10 +0300 Subject: add some hacky workarounds for bridge library inability to restore state if main process was killed --- org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java | 5 +++-- org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'org.fox.ttrss/src/main/java') 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 15b37002..4c3711e5 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java @@ -105,8 +105,9 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList ft.replace(R.id.article_fragment, af, FRAG_ARTICLE); ft.commit(); - - setTitle(feed.title); + + if (feed != null) + setTitle(feed.title); } } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 1899350b..c5165399 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -487,7 +487,7 @@ public class HeadlinesFragment extends StateSavedFragment { a.unread = false; m_readArticles.add(a); - m_feed.unread--; + if (m_feed != null) m_feed.unread--; } } } @@ -521,7 +521,7 @@ public class HeadlinesFragment extends StateSavedFragment { } }); - if (m_activity.isSmallScreen()) { + if (m_activity.isSmallScreen() && m_feed != null) { m_activity.setTitle(m_feed.title); } @@ -1014,7 +1014,7 @@ public class HeadlinesFragment extends StateSavedFragment { } if (holder.feedTitleView != null) { - if (article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) { + if (article.feed_title != null && m_feed != null && (m_feed.is_cat || m_feed.id < 0)) { holder.feedTitleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, headlineSmallFontSize); holder.feedTitleView.setText(article.feed_title); -- cgit v1.2.3