Fixed 'keep both' action in conflicts dialog (both resulting file were linked to...

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

diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index 1b66509..a4d12fd 100644 (file)
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -157,7 +157,6 @@ public class FileObserverService extends Service {
             String path = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
             OwnCloudFileObserver observer =
                     new OwnCloudFileObserver(   path, 
-                                                storage.getFileByPath(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH))),
                                                 account, 
                                                 getApplicationContext(), 
                                                 OwnCloudFileObserver.CHANGES_ONLY);
@@ -197,8 +196,7 @@ public class FileObserverService extends Service {
         OwnCloudFileObserver observer = mObserversMap.get(localPath);
         if (observer == null) {
             /// the local file was never registered to observe before
-            observer = new OwnCloudFileObserver(   localPath, 
-                                                    file,
+            observer = new OwnCloudFileObserver(    localPath, 
                                                     account, 
                                                     getApplicationContext(), 
                                                     OwnCloudFileObserver.CHANGES_ONLY);