Merge pull request #2330 from nextcloud/revert-2037-useIgnoreEtagAgain

Revert "Do not ignore ignoreEtags"
nextcloud · Mar 12, 2018 · 67956ec · 67956ec
2 parents 1c41baf + 1d2ed0b
commit 67956ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -282,7 +282,7 @@ public void onClick(View v) {
             }
         } else {
             createMinFragments(savedInstanceState);
-            refreshList(false);
+            refreshList(true);
         }
 
         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
@@ -124,7 +124,7 @@ public class ExtendedListFragment extends Fragment
     private ArrayList<Integer> mTops;
     private int mHeightCell = 0;
 
-    private OnEnforceableRefreshListener mOnRefreshListener = null;
+    private SwipeRefreshLayout.OnRefreshListener mOnRefreshListener = null;
 
     protected AbsListView mCurrentListView;
     private ExtendedListView mListView;
@@ -880,7 +880,7 @@ public void onRefresh(boolean ignoreETag) {
         mRefreshEmptyLayout.setRefreshing(false);
 
         if (mOnRefreshListener != null) {
-            mOnRefreshListener.onRefresh(ignoreETag);
+            mOnRefreshListener.onRefresh();
         }
     }
 

diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -1678,7 +1678,7 @@ public void onRefresh() {
             mRefreshGridLayout.setRefreshing(false);
             mRefreshEmptyLayout.setRefreshing(false);
         } else {
-            super.onRefresh(false);
+            super.onRefresh();
         }
     }