Improved reaction when events about kept-in-sync files are received

diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java
index d887256..964b61c 100644 (file)
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -28,8 +28,6 @@ import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 

-
-

 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;


@@ -37,45 +35,57 @@ import android.os.FileObserver;
 
 public class OwnCloudFileObserver extends FileObserver {
 
 
 public class OwnCloudFileObserver extends FileObserver {
 

-    public static int CHANGES_ONLY = CLOSE_WRITE;
+    private static int MASK = (FileObserver.MODIFY | FileObserver.CLOSE_WRITE);

     
     private static String TAG = OwnCloudFileObserver.class.getSimpleName();
     
     private String mPath;
     private int mMask;
     private Account mOCAccount;
     
     private static String TAG = OwnCloudFileObserver.class.getSimpleName();
     
     private String mPath;
     private int mMask;
     private Account mOCAccount;

-    //private OCFile mFile;

     private Context mContext;
     private Context mContext;

+    private boolean mModified;

 
     
 
     

-    public OwnCloudFileObserver(String path, Account account, Context context, int mask) {
-        super(path, mask);
+    public OwnCloudFileObserver(String path, Account account, Context context) {
+        super(path, MASK);

         if (path == null)
             throw new IllegalArgumentException("NULL path argument received"); 
         if (path == null)
             throw new IllegalArgumentException("NULL path argument received"); 

-        /*if (file == null)
-            throw new IllegalArgumentException("NULL file argument received");*/ 

         if (account == null)
             throw new IllegalArgumentException("NULL account argument received"); 
         if (context == null)
             throw new IllegalArgumentException("NULL context argument received");
         if (account == null)
             throw new IllegalArgumentException("NULL account argument received"); 
         if (context == null)
             throw new IllegalArgumentException("NULL context argument received");

-        /*if (!path.equals(file.getStoragePath()) && !path.equals(FileStorageUtils.getDefaultSavePathFor(account.name, file)))
-            throw new IllegalArgumentException("File argument is not linked to the local file set in path argument"); */

         mPath = path;
         mPath = path;

-        //mFile = file;

         mOCAccount = account;
         mContext = context; 
         mOCAccount = account;
         mContext = context; 

-        mMask = mask;
+        mModified = false;

     }
     
     }
     

+    

     @Override
     public void onEvent(int event, String path) {
         Log_OC.d(TAG, "Got file modified with event " + event + " and path " + mPath + ((path != null) ? File.separator + path : ""));
     @Override
     public void onEvent(int event, String path) {
         Log_OC.d(TAG, "Got file modified with event " + event + " and path " + mPath + ((path != null) ? File.separator + path : ""));

-        if ((event & mMask) == 0) {
+        if ((event & MASK) == 0) {

             Log_OC.wtf(TAG, "Incorrect event " + event + " sent for file " + mPath + ((path != null) ? File.separator + path : "") +
                          " with registered for " + mMask + " and original path " +
                          mPath);
             Log_OC.wtf(TAG, "Incorrect event " + event + " sent for file " + mPath + ((path != null) ? File.separator + path : "") +
                          " with registered for " + mMask + " and original path " +
                          mPath);

-            return;
-        }
+        } else {
+            if ((event & FileObserver.MODIFY) != 0) {
+                // file changed
+                mModified = true;
+            }
+            // not sure if it's possible, but let's assume that both kind of events can be received at the same time
+            if ((event & FileObserver.CLOSE_WRITE) != 0) {
+                // file closed
+                if (mModified) {
+                    mModified = false;
+                    startSyncOperation();
+                }
+            }
+        }  
+    }
+
+    
+    private void startSyncOperation() {

         FileDataStorageManager storageManager = new FileDataStorageManager(mOCAccount, mContext.getContentResolver());
         OCFile file = storageManager.getFileByLocalPath(mPath);     // a fresh object is needed; many things could have occurred to the file since it was registered to observe
                                                                     // again, assuming that local files are linked to a remote file AT MOST, SOMETHING TO BE DONE; 
         FileDataStorageManager storageManager = new FileDataStorageManager(mOCAccount, mContext.getContentResolver());
         OCFile file = storageManager.getFileByLocalPath(mPath);     // a fresh object is needed; many things could have occurred to the file since it was registered to observe
                                                                     // again, assuming that local files are linked to a remote file AT MOST, SOMETHING TO BE DONE; 

diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index 7aa3fa9..502d459 100644 (file)
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -162,8 +162,7 @@ public class FileObserverService extends Service {
             OwnCloudFileObserver observer =
                     new OwnCloudFileObserver(   path, 
                                                 account, 
             OwnCloudFileObserver observer =
                     new OwnCloudFileObserver(   path, 
                                                 account, 

-                                                getApplicationContext(), 
-                                                OwnCloudFileObserver.CHANGES_ONLY);
+                                                getApplicationContext());

             mObserversMap.put(path, observer);
             if (new File(path).exists()) {
                 observer.startWatching();
             mObserversMap.put(path, observer);
             if (new File(path).exists()) {
                 observer.startWatching();


@@ -202,8 +201,7 @@ public class FileObserverService extends Service {
             /// the local file was never registered to observe before
             observer = new OwnCloudFileObserver(    localPath, 
                                                     account, 
             /// the local file was never registered to observe before
             observer = new OwnCloudFileObserver(    localPath, 
                                                     account, 

-                                                    getApplicationContext(), 
-                                                    OwnCloudFileObserver.CHANGES_ONLY);
+                                                    getApplicationContext());

             mObserversMap.put(localPath, observer);
             Log_OC.d(TAG, "Observer added for path " + localPath);
         
             mObserversMap.put(localPath, observer);
             Log_OC.d(TAG, "Observer added for path " + localPath);