Merge branch 'master' of https://github.com/owncloud/android into develop

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / FileOperationsHelper.java

diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index 5899e7a..2f2907d 100644 (file)
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -225,9 +225,8 @@ public class FileOperationsHelper {
         }
     }
 
         }
     }
 

-    public void toggleKeepInSync(OCFile file, boolean isFavorite) {
-        Log_OC.e(TAG, "KeepInSync");
-        file.setKeepInSync(isFavorite);
+    public void toggleFavorite(OCFile file, boolean isFavorite) {
+        file.setFavorite(isFavorite);

         mFileActivity.getStorageManager().saveFile(file);
 
         /// register the OCFile instance in the observer service to monitor local updates
         mFileActivity.getStorageManager().saveFile(file);
 
         /// register the OCFile instance in the observer service to monitor local updates


@@ -239,7 +238,7 @@ public class FileOperationsHelper {
         mFileActivity.startService(observedFileIntent);
 
         /// immediate content synchronization
         mFileActivity.startService(observedFileIntent);
 
         /// immediate content synchronization

-        if (file.keepInSync()) {
+        if (file.isFavorite()) {

             syncFile(file);
         }
     }
             syncFile(file);
         }
     }


@@ -302,8 +301,8 @@ public class FileOperationsHelper {
             downloaderBinder.cancel(account, file);
 
             // TODO - review why is this here, and solve in a better way
             downloaderBinder.cancel(account, file);
 
             // TODO - review why is this here, and solve in a better way

-            // Remove etag for parent, if file is a keep_in_sync
-            if (file.keepInSync()) {
+            // Remove etag for parent, if file is a favorite
+            if (file.isFavorite()) {

                 OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId());
                 parent.setEtag("");
                 mFileActivity.getStorageManager().saveFile(parent);
                 OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId());
                 parent.setEtag("");
                 mFileActivity.getStorageManager().saveFile(parent);