From 85ef8d8d1356eec65e84a4c911fbc7ab2a0e7792 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 16 Oct 2013 15:28:59 +0400 Subject: fix indeterminate progressbar not completing if http request fails --- src/org/fox/ttrss/FeedCategoriesFragment.java | 5 +---- src/org/fox/ttrss/FeedsFragment.java | 5 +---- src/org/fox/ttrss/HeadlinesFragment.java | 10 +++++----- 3 files changed, 7 insertions(+), 13 deletions(-) (limited to 'src/org') diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index 5c0a15ff..3c03952b 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -296,6 +296,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe if (isDetached()) return; m_activity.setProgressBarVisibility(false); + m_activity.m_pullToRefreshAttacher.setRefreshComplete(); if (getView() != null) { ListView list = (ListView)getView().findViewById(R.id.feeds); @@ -335,10 +336,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe //m_adapter.notifyDataSetChanged(); (done by sortCats) m_activity.setLoadingStatus(R.string.blank, false); - if (isAdded()) { - m_activity.m_pullToRefreshAttacher.setRefreshComplete(); - } - return; } diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 97b1f2b2..f6692ca7 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -442,6 +442,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh } m_activity.setProgressBarVisibility(false); + m_activity.m_pullToRefreshAttacher.setRefreshComplete(); if (result != null) { try { @@ -469,10 +470,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh if (m_enableFeedIcons && !m_feedIconsChecked && Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) getFeedIcons(); - if (isAdded()) { - m_activity.m_pullToRefreshAttacher.setRefreshComplete(); - } - return; } diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index e3f70102..c23889aa 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -409,7 +409,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_activity.setProgressBarVisibility(false); super.onPostExecute(result); - + + if (isAdded()) { + m_activity.m_pullToRefreshAttacher.setRefreshComplete(); + } + if (result != null) { m_refreshInProgress = false; @@ -419,10 +423,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_adapter.notifyDataSetChanged(); m_listener.onHeadlinesLoaded(fappend); - if (isAdded()) { - m_activity.m_pullToRefreshAttacher.setRefreshComplete(); - } - } else { if (m_lastError == ApiError.LOGIN_FAILED) { m_activity.login(); -- cgit v1.2.3