Update with changes after CR

diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 31e4e7a..60f35a5 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -110,7 +110,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
     private boolean mRemoteFolderChanged;
 
     /** 'True' means that Etag will be ignored */
     private boolean mRemoteFolderChanged;
 
     /** 'True' means that Etag will be ignored */

-    private boolean mIgnoreTag;
+    private boolean mIgnoreETag;

 
     
     /**
 
     
     /**


@@ -129,7 +129,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                                         long currentSyncTime, 
                                         boolean syncFullAccount,
                                         boolean isShareSupported,
                                         long currentSyncTime, 
                                         boolean syncFullAccount,
                                         boolean isShareSupported,

-                                        boolean ignoreTag,
+                                        boolean ignoreETag,

                                         FileDataStorageManager dataStorageManager, 
                                         Account account, 
                                         Context context ) {
                                         FileDataStorageManager dataStorageManager, 
                                         Account account, 
                                         Context context ) {


@@ -142,7 +142,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         mContext = context;
         mForgottenLocalFiles = new HashMap<String, String>();
         mRemoteFolderChanged = false;
         mContext = context;
         mForgottenLocalFiles = new HashMap<String, String>();
         mRemoteFolderChanged = false;

-        mIgnoreTag = ignoreTag;
+        mIgnoreETag = ignoreETag;

     }
     
     
     }
     
     


@@ -233,7 +233,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
         if (result.isSuccess()){
             OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
 
         if (result.isSuccess()){
             OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
 

-            if (!mIgnoreTag) {
+            if (!mIgnoreETag) {

                 // check if remote and local folder are different
                 mRemoteFolderChanged = !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag()));
             }
                 // check if remote and local folder are different
                 mRemoteFolderChanged = !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag()));
             }

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index a09b657..c52845f 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -111,7 +111,7 @@ import com.owncloud.android.utils.Log_OC;
 
 public class FileDisplayActivity extends HookActivity implements
 FileFragment.ContainerActivity, OnNavigationListener, 
 
 public class FileDisplayActivity extends HookActivity implements
 FileFragment.ContainerActivity, OnNavigationListener, 

-OnSslUntrustedCertListener, SwipeRefresh {
+OnSslUntrustedCertListener, OnEnforceableRefreshListener {

     
     private ArrayAdapter<String> mDirectories;
 
     
     private ArrayAdapter<String> mDirectories;
 


@@ -1589,7 +1589,7 @@ OnSslUntrustedCertListener, SwipeRefresh {
         return null;
     }
     
         return null;
     }
     

-    public void startSyncFolderOperation(OCFile folder, boolean ignoreTag) {
+    public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {

         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;
         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;


@@ -1599,7 +1599,7 @@ OnSslUntrustedCertListener, SwipeRefresh {
                                                                         currentSyncTime, 
                                                                         false,
                                                                         getFileOperationsHelper().isSharedSupported(),
                                                                         currentSyncTime, 
                                                                         false,
                                                                         getFileOperationsHelper().isSharedSupported(),

-                                                                        ignoreTag,
+                                                                        ignoreETag,

                                                                         getStorageManager(), 
                                                                         getAccount(), 
                                                                         getApplicationContext()
                                                                         getStorageManager(), 
                                                                         getAccount(), 
                                                                         getApplicationContext()


@@ -1712,8 +1712,8 @@ OnSslUntrustedCertListener, SwipeRefresh {
     }
 
     @Override
     }
 
     @Override

-    public void onRefreshForced(boolean ignoreTag) {
-        refreshList(ignoreTag);
+    public void onRefresh(boolean ignoreETag) {
+        refreshList(ignoreETag);

     }
 
     @Override
     }
 
     @Override


@@ -1721,14 +1721,14 @@ OnSslUntrustedCertListener, SwipeRefresh {
         refreshList(true);
     }
 
         refreshList(true);
     }
 

-    private void refreshList(boolean ignoreTag) {
+    private void refreshList(boolean ignoreETag) {

         OCFileListFragment listOfFiles = getListOfFilesFragment();
         if (listOfFiles != null) {
             OCFile folder = listOfFiles.getCurrentFile();
             if (folder != null) {
                 /*mFile = mContainerActivity.getStorageManager().getFileById(mFile.getFileId());
                 listDirectory(mFile);*/
         OCFileListFragment listOfFiles = getListOfFilesFragment();
         if (listOfFiles != null) {
             OCFile folder = listOfFiles.getCurrentFile();
             if (folder != null) {
                 /*mFile = mContainerActivity.getStorageManager().getFileById(mFile.getFileId());
                 listDirectory(mFile);*/

-                startSyncFolderOperation(folder, ignoreTag);
+                startSyncFolderOperation(folder, ignoreETag);

             }
         }
     }
             }
         }
     }

diff --git a/src/com/owncloud/android/ui/activity/MoveActivity.java b/src/com/owncloud/android/ui/activity/MoveActivity.java
index f6a9529..1863370 100644 (file)
--- a/src/com/owncloud/android/ui/activity/MoveActivity.java
+++ b/src/com/owncloud/android/ui/activity/MoveActivity.java
@@ -206,7 +206,7 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
     }
 
     
     }
 
     

-    public void startSyncFolderOperation(OCFile folder, boolean ignoreTag) {
+    public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {

         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;
         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;


@@ -216,7 +216,7 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
                                                                         currentSyncTime, 
                                                                         false,
                                                                         getFileOperationsHelper().isSharedSupported(),
                                                                         currentSyncTime, 
                                                                         false,
                                                                         getFileOperationsHelper().isSharedSupported(),

-                                                                        ignoreTag,
+                                                                        ignoreETag,

                                                                         getStorageManager(), 
                                                                         getAccount(), 
                                                                         getApplicationContext()
                                                                         getStorageManager(), 
                                                                         getAccount(), 
                                                                         getApplicationContext()

diff --git a/src/com/owncloud/android/ui/activity/OnEnforceableRefreshListener.java b/src/com/owncloud/android/ui/activity/OnEnforceableRefreshListener.java
new file mode 100644 (file)
index 0000000..22bdb18
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/OnEnforceableRefreshListener.java
@@ -0,0 +1,10 @@
+package com.owncloud.android.ui.activity;
+
+import android.support.v4.widget.SwipeRefreshLayout;
+
+    public interface OnEnforceableRefreshListener extends SwipeRefreshLayout.OnRefreshListener {
+
+        public void onRefresh(boolean enforced);
+
+    }
+

diff --git a/src/com/owncloud/android/ui/activity/SwipeRefresh.java b/src/com/owncloud/android/ui/activity/SwipeRefresh.java
deleted file mode 100644 (file)
index dc01b42..0000000
--- a/src/com/owncloud/android/ui/activity/SwipeRefresh.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.owncloud.android.ui.activity;
-
-import android.support.v4.widget.SwipeRefreshLayout;
-
-    public interface SwipeRefresh extends SwipeRefreshLayout.OnRefreshListener {
-
-        public void onRefreshForced(boolean ingnoreTag);
-
-    }
-

diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 01fe5a5..85b04b2 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -34,14 +34,14 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.SherlockFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.ui.ExtendedListView;
 import com.actionbarsherlock.app.SherlockFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.ui.ExtendedListView;

-import com.owncloud.android.ui.activity.SwipeRefresh;
+import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;

 import com.owncloud.android.utils.Log_OC;
 
 /**
  *  TODO extending SherlockListFragment instead of SherlockFragment 
  */
 public class ExtendedListFragment extends SherlockFragment 
 import com.owncloud.android.utils.Log_OC;
 
 /**
  *  TODO extending SherlockListFragment instead of SherlockFragment 
  */
 public class ExtendedListFragment extends SherlockFragment 

-implements OnItemClickListener, SwipeRefresh {
+implements OnItemClickListener, OnEnforceableRefreshListener {

     
     private static final String TAG = ExtendedListFragment.class.getSimpleName();
 
     
     private static final String TAG = ExtendedListFragment.class.getSimpleName();
 


@@ -64,7 +64,7 @@ implements OnItemClickListener, SwipeRefresh {
     private ArrayList<Integer> mTops;
     private int mHeightCell = 0;
 
     private ArrayList<Integer> mTops;
     private int mHeightCell = 0;
 

-    private SwipeRefresh mOnRefreshListener = null;
+    private OnEnforceableRefreshListener mOnRefreshListener = null;

     
     
     public void setListAdapter(ListAdapter listAdapter) {
     
     
     public void setListAdapter(ListAdapter listAdapter) {


@@ -241,7 +241,7 @@ implements OnItemClickListener, SwipeRefresh {
         }
     }
     
         }
     }
     

-    public void setOnRefreshListener(SwipeRefresh listener) {
+    public void setOnRefreshListener(OnEnforceableRefreshListener listener) {

         mOnRefreshListener = listener;
     }
     
         mOnRefreshListener = listener;
     }
     


@@ -302,12 +302,12 @@ implements OnItemClickListener, SwipeRefresh {
     }
 
     @Override
     }
 
     @Override

-    public void onRefreshForced(boolean ingnoreTag) {
+    public void onRefresh(boolean ignoreETag) {

         mRefreshLayout.setRefreshing(false);
         mRefreshEmptyLayout.setRefreshing(false);
 
         if (mOnRefreshListener != null) {
         mRefreshLayout.setRefreshing(false);
         mRefreshEmptyLayout.setRefreshing(false);
 
         if (mOnRefreshListener != null) {

-            mOnRefreshListener.onRefreshForced(ingnoreTag);
+            mOnRefreshListener.onRefresh(ignoreETag);

         }
     }
 }
         }
     }
 }

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 9a26b70..4e76853 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -36,7 +36,7 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.MoveActivity;
 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.MoveActivity;

-import com.owncloud.android.ui.activity.SwipeRefresh;
+import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;

 import com.owncloud.android.ui.adapter.FileListListAdapter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
 import com.owncloud.android.ui.adapter.FileListListAdapter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;


@@ -89,7 +89,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                     FileFragment.ContainerActivity.class.getSimpleName());
         }
         try {
                     FileFragment.ContainerActivity.class.getSimpleName());
         }
         try {

-            setOnRefreshListener((SwipeRefresh) activity);
+            setOnRefreshListener((OnEnforceableRefreshListener) activity);

             
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString() + " must implement " + 
             
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString() + " must implement " + 


@@ -175,7 +175,7 @@ public class OCFileListFragment extends ExtendedListFragment {
             
             listDirectory(mFile);
 
             
             listDirectory(mFile);
 

-            onRefreshForced(false);
+            onRefresh(false);

             
             // restore index and top position
             restoreIndexAndTopPosition();
             
             // restore index and top position
             restoreIndexAndTopPosition();