summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-10-17 00:25:39 +0400
committerAndrew Dolgov <[email protected]>2014-10-17 00:25:39 +0400
commit2af8bc98c87676265585fd70eaca9b39fa2f8a61 (patch)
tree9c0477e6aa3d66ffea920f3d672e54186f70e9f0
parent8f6ca0eec07c077269d97edaf9c89f2eaf3fc115 (diff)
check whether swipeLayout is null before trying to deal with it
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java4
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java6
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java6
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java8
4 files changed, 12 insertions, 12 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index 4439a943..8a927dc6 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -282,7 +282,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
} */
public void refresh(boolean background) {
- m_swipeLayout.setRefreshing(true);
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
CatsRequest req = new CatsRequest(getActivity().getApplicationContext());
@@ -325,7 +325,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
if (isDetached()) return;
m_activity.setProgressBarVisibility(false);
- m_swipeLayout.setRefreshing(false);
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
if (getView() != null) {
ListView list = (ListView)getView().findViewById(R.id.feeds);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index 7c974809..b6713308 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -379,8 +379,8 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
@SuppressWarnings({ "serial" })
public void refresh(boolean background) {
//FeedCategory cat = m_onlineServices.getActiveCategory();
-
- m_swipeLayout.setRefreshing(true);
+
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
final int catId = (m_activeCategory != null) ? m_activeCategory.id : -4;
@@ -502,7 +502,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
m_activity.setProgressBarVisibility(false);
//m_activity.m_pullToRefreshAttacher.setRefreshComplete();
- m_swipeLayout.setRefreshing(false);
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
if (result != null) {
try {
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 32670252..fae1cc22 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -298,7 +298,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
View view = inflater.inflate(R.layout.headlines_fragment, container, false);
m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.headlines_swipe_container);
-
+
m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
@@ -415,7 +415,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (m_activity != null && m_feed != null) {
m_refreshInProgress = true;
- m_swipeLayout.setRefreshing(true);
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
m_activity.setProgressBarVisibility(true);
if (!m_feed.equals(GlobalState.getInstance().m_activeFeed)) {
@@ -463,7 +463,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
super.onPostExecute(result);
if (isAdded()) {
- m_swipeLayout.setRefreshing(false);
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
}
if (result != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 7f9d73f7..c8405b8f 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -246,8 +246,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
public void refresh() {
try {
if (!isAdded()) return;
-
- m_swipeLayout.setRefreshing(true);
+
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
if (m_cursor != null && !m_cursor.isClosed()) m_cursor.close();
@@ -257,8 +257,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
m_adapter.changeCursor(m_cursor);
m_adapter.notifyDataSetChanged();
}
-
- m_swipeLayout.setRefreshing(false);
+
+ if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
} catch (NullPointerException e) {
e.printStackTrace();