Synchronize kept-in-sync files during account synchronization, in both directions...

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

diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java
index bc52830..3cbdb1e 100644 (file)
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -18,13 +18,12 @@
 
 package com.owncloud.android.files;
 
 
 package com.owncloud.android.files;
 

+import java.io.File;

 import java.util.LinkedList;
 import java.util.List;
 
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import java.util.LinkedList;
 import java.util.List;
 
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;

-import com.owncloud.android.files.OwnCloudFileObserver.FileObserverStatusListener.Status;
-import com.owncloud.android.files.services.FileUploader;

 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFileOperation;


@@ -33,22 +32,21 @@ import eu.alefzero.webdav.WebdavClient;
 
 import android.accounts.Account;
 import android.content.Context;
 
 import android.accounts.Account;
 import android.content.Context;

-import android.content.Intent;

 import android.os.FileObserver;
 import android.util.Log;
 
 public class OwnCloudFileObserver extends FileObserver {
 
 import android.os.FileObserver;
 import android.util.Log;
 
 public class OwnCloudFileObserver extends FileObserver {
 

-    public static int CHANGES_ONLY = CLOSE_WRITE | MOVED_FROM | MODIFY;
+    public static int CHANGES_ONLY = CLOSE_WRITE;

     
     

-    private static String TAG = "OwnCloudFileObserver";
+    private static String TAG = OwnCloudFileObserver.class.getSimpleName();

     private String mPath;
     private int mMask;
     private String mPath;
     private int mMask;

-    DataStorageManager mStorage;
-    Account mOCAccount;
-    OCFile mFile;
-    static Context mContext;
-    List<FileObserverStatusListener> mListeners;
+    private DataStorageManager mStorage;
+    private Account mOCAccount;
+    private OCFile mFile;
+    private Context mContext;
+    private List<FileObserverStatusListener> mListeners;

     
     public OwnCloudFileObserver(String path) {
         this(path, ALL_EVENTS);
     
     public OwnCloudFileObserver(String path) {
         this(path, ALL_EVENTS);


@@ -91,49 +89,39 @@ public class OwnCloudFileObserver extends FileObserver {
     
     @Override
     public void onEvent(int event, String path) {
     
     @Override
     public void onEvent(int event, String path) {

-        Log.d(TAG, "Got file modified with event " + event + " and path " + path);
+        Log.d(TAG, "Got file modified with event " + event + " and path " + mPath + ((path != null) ? File.separator + path : ""));

         if ((event & mMask) == 0) {
         if ((event & mMask) == 0) {

-            Log.wtf(TAG, "Incorrect event " + event + " sent for file " + path +
+            Log.wtf(TAG, "Incorrect event " + event + " sent for file " + mPath + ((path != null) ? File.separator + path : "") +

                          " with registered for " + mMask + " and original path " +
                          mPath);
                          " with registered for " + mMask + " and original path " +
                          mPath);

+            /* Unexpected event that will be ignored; no reason to propagate it 

             for (FileObserverStatusListener l : mListeners)
                 l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.INCORRECT_MASK);
             for (FileObserverStatusListener l : mListeners)
                 l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.INCORRECT_MASK);

+            */

             return;
         }
         WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mOCAccount, mContext);
             return;
         }
         WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mOCAccount, mContext);

-        SynchronizeFileOperation sfo = new SynchronizeFileOperation(mFile.getRemotePath(), mStorage, mOCAccount, mContext);
+        SynchronizeFileOperation sfo = new SynchronizeFileOperation(mFile, null, mStorage, mOCAccount, true, false, mContext);

         RemoteOperationResult result = sfo.execute(wc);
         RemoteOperationResult result = sfo.execute(wc);

-        
-        if (result.getExtraData() == Boolean.TRUE) {
-            // inform user about conflict and let him decide what to do
-            for (FileObserverStatusListener l : mListeners)
-                l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.CONFLICT);
-            return;
+        for (FileObserverStatusListener l : mListeners) {
+            l.onObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, result);

         }
         }

-
-        for (FileObserverStatusListener l : mListeners)
-            l.OnObservedFileStatusUpdate(mPath, getRemotePath(), mOCAccount, Status.SENDING_TO_UPLOADER);

         
         

-        Intent i = new Intent(mContext, FileUploader.class);
-        i.putExtra(FileUploader.KEY_ACCOUNT, mOCAccount);
-        i.putExtra(FileUploader.KEY_REMOTE_FILE, mFile.getRemotePath());
-        i.putExtra(FileUploader.KEY_LOCAL_FILE, mPath);
-        i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
-        i.putExtra(FileUploader.KEY_FORCE_OVERWRITE, true);
-        mContext.startService(i);

     }
     
     public interface FileObserverStatusListener {
     }
     
     public interface FileObserverStatusListener {

-        public enum Status {
-            SENDING_TO_UPLOADER,
-            CONFLICT,
-            INCORRECT_MASK
-        }
-        
-        public void OnObservedFileStatusUpdate(String localPath,
+        public void onObservedFileStatusUpdate(String localPath,

                                                String remotePath,
                                                Account account,
                                                String remotePath,
                                                Account account,

-                                               FileObserverStatusListener.Status status);
+                                               RemoteOperationResult result);
+    }
+
+    public OCFile getOCFile() {
+        return mFile;
+    }
+
+    public Account getAccount() {
+        return mOCAccount;

     }
     
 }
     }
     
 }