From 7840fb4db0d6dd03f92975ca895b553a1e6e9de7 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 25 Jan 2018 08:47:05 +0100
Subject: [PATCH] do not ignore ignoreEtags

---
 .../com/owncloud/android/ui/activity/FileDisplayActivity.java | 2 +-
 .../owncloud/android/ui/fragment/ExtendedListFragment.java    | 4 ++--
 .../com/owncloud/android/ui/fragment/OCFileListFragment.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index be1addd347..571af1a242 100644
--- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -276,7 +276,7 @@ public class FileDisplayActivity extends HookActivity
             }
         } else {
             createMinFragments(savedInstanceState);
-            refreshList(true);
+            refreshList(false);
         }
 
         setIndeterminate(mSyncInProgress);
diff --git a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index d09da56855..6913519e5a 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -123,7 +123,7 @@ public class ExtendedListFragment extends Fragment
     private ArrayList<Integer> mTops;
     private int mHeightCell = 0;
 
-    private SwipeRefreshLayout.OnRefreshListener mOnRefreshListener = null;
+    private OnEnforceableRefreshListener mOnRefreshListener = null;
 
     protected AbsListView mCurrentListView;
     private ExtendedListView mListView;
@@ -862,7 +862,7 @@ public class ExtendedListFragment extends Fragment
         mRefreshEmptyLayout.setRefreshing(false);
 
         if (mOnRefreshListener != null) {
-            mOnRefreshListener.onRefresh();
+            mOnRefreshListener.onRefresh(ignoreETag);
         }
     }
 
diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 0ffd589b65..ca9c3df200 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -1676,7 +1676,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
             mRefreshGridLayout.setRefreshing(false);
             mRefreshEmptyLayout.setRefreshing(false);
         } else {
-            super.onRefresh();
+            super.onRefresh(false);
         }
     }