show drawer loading when refreshing fragment not initiated by swiping

2 files changed, 22 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 750fb91c..146017ad 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -337,7 +337,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 	    m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
 			@Override
 			public void onRefresh() {
-				refresh(false);
+				refresh(true);
 			}
 		});
 
@@ -356,8 +356,6 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 			loadingBar.setVisibility(View.VISIBLE);
 		}
 
-		//m_activity.m_pullToRefreshAttacher.addRefreshableView(list, this);
-		
 		return view; 
 	}
 	
@@ -390,10 +388,18 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 		//out.putParcelable("cats", m_cats);
 	}
 
-	public void refresh(boolean background) {
+	public void refresh(boolean swipeRefresh) {
 		if (!isAdded()) return;
 
-        if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
+        if (m_swipeLayout != null && swipeRefresh) {
+			m_swipeLayout.setRefreshing(true);
+		} else {
+			View loadingBar = getView().findViewById(R.id.feeds_loading_bar);
+
+			if (loadingBar != null) {
+				loadingBar.setVisibility(View.VISIBLE);
+			}
+		}
 
 		getLoaderManager().restartLoader(0, null, this).forceLoad();
 	}
@@ -529,8 +535,4 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 		return m_selectedCat;
 	}
 
-	/* @Override
-	public void onRefreshStarted(View view) {
-		refresh(false);
-	} */
 }
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 a15ffb0d..87363f8b 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -366,7 +366,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
 	    m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
 			@Override
 			public void onRefresh() {
-				refresh(false);
+				refresh(true);
 			}
 		});
 
@@ -465,10 +465,18 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
 	}
 
 	@SuppressWarnings({ "serial" })
-	public void refresh(boolean background) {
+	public void refresh(boolean swipeRefresh) {
 		if (!isAdded()) return;
 
-		if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
+		if (m_swipeLayout != null && swipeRefresh) {
+            m_swipeLayout.setRefreshing(true);
+        } else {
+            View loadingBar = getView().findViewById(R.id.feeds_loading_bar);
+
+            if (loadingBar != null) {
+                loadingBar.setVisibility(View.VISIBLE);
+            }
+        }
 
 		getLoaderManager().restartLoader(0, null, this).forceLoad();
 	}