diff options
| author | Andrew Dolgov <[email protected]> | 2013-06-03 22:52:51 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-06-03 22:52:51 +0400 |
| commit | 1f91618d33f68bbb92d9aee51efd437a0415dcfb (patch) | |
| tree | 3829b68c81b709048a17a860f2a2ac680f8f80fc | |
| parent | 124c791ab8f2617a07bba69f570bd84ddb18110e (diff) | |
fix possible crash in headlinesfragment.refresh if invoked when fragment
is not yet initialized
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/FeedsFragment.java | 1 | ||||
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5ff53a96..fbd5b369 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="184" - android:versionName="1.8.4" > + android:versionCode="185" + android:versionName="1.8.5" > <uses-sdk android:minSdkVersion="8" diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 181d4418..dafbd26d 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -282,7 +282,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh @SuppressWarnings({ "unchecked", "serial" }) public void refresh(boolean background) { //FeedCategory cat = m_onlineServices.getActiveCategory(); - m_activity.setProgressBarVisibility(true); final int catId = (m_activeCategory != null) ? m_activeCategory.id : -4; diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index c1499cec..42d960bc 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -362,7 +362,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, @SuppressWarnings({ "unchecked", "serial" }) public void refresh(boolean append) { - if (m_activity != null) { + if (m_activity != null && m_feed != null) { m_refreshInProgress = true; m_activity.setProgressBarVisibility(true); |