X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/22a789e8d2cecffc6b445f4487ddaada2d6f5e4a..053aad5ae17a1ad7a15218c220810e6b369fea4c:/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 1854f349..8e1f7363 100644
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -27,7 +28,6 @@ import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
-import com.owncloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.WebdavClient;
 
@@ -46,24 +46,24 @@ public class OwnCloudFileObserver extends FileObserver {
     private String mPath;
     private int mMask;
     private Account mOCAccount;
-    private OCFile mFile;
+    //private OCFile mFile;
     private Context mContext;
 
     
-    public OwnCloudFileObserver(String path, OCFile file, Account account, Context context, int mask) {
+    public OwnCloudFileObserver(String path, Account account, Context context, int mask) {
         super(path, mask);
         if (path == null)
             throw new IllegalArgumentException("NULL path argument received"); 
-        if (file == null)
-            throw new IllegalArgumentException("NULL file 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 (!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");
+        /*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;
-        mFile = file;
+        //mFile = file;
         mOCAccount = account;
         mContext = context; 
         mMask = mask;
@@ -79,9 +79,12 @@ public class OwnCloudFileObserver extends FileObserver {
             return;
         }
         WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mOCAccount, mContext);
-        SynchronizeFileOperation sfo = new SynchronizeFileOperation(mFile, 
+        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; 
+        SynchronizeFileOperation sfo = new SynchronizeFileOperation(file, 
                                                                     null, 
-                                                                    new FileDataStorageManager(mOCAccount, mContext.getContentResolver()), 
+                                                                    storageManager, 
                                                                     mOCAccount, 
                                                                     true, 
                                                                     true, 
@@ -91,9 +94,8 @@ public class OwnCloudFileObserver extends FileObserver {
             // ISSUE 5: if the user is not running the app (this is a service!), this can be very intrusive; a notification should be preferred
             Intent i = new Intent(mContext, ConflictsResolveActivity.class);
             i.setFlags(i.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
-            i.putExtra("remotepath", mFile.getRemotePath());
-            i.putExtra("localpath", mPath);
-            i.putExtra("account", mOCAccount);
+            i.putExtra(ConflictsResolveActivity.EXTRA_FILE, file);
+            i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, mOCAccount);
             mContext.startActivity(i);
         }
         // TODO save other errors in some point where the user can inspect them later;