diff options
3 files changed, 8 insertions, 7 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 5bd95214..5b55d4f4 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/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="466" - android:versionName="1.232"> + android:versionCode="467" + android:versionName="1.233"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 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); |