X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9aab2d26da38f26e7ff03a0b5db3bd01b51bce05..bd38627e14eeb75039be0c46717b7c7e8f783923:/src/com/owncloud/android/files/OwnCloudFileObserver.java?ds=inline

diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java
index 5416bd95..1e0c176c 100644
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -18,6 +18,7 @@
 
 package com.owncloud.android.files;
 
+import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -41,14 +42,14 @@ public class OwnCloudFileObserver extends FileObserver {
 
     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;
-    DataStorageManager mStorage;
-    Account mOCAccount;
-    OCFile mFile;
-    static Context mContext;    // ISSUE 4: why is this static?
-    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);
@@ -91,9 +92,9 @@ public class OwnCloudFileObserver extends FileObserver {
     
     @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) {
-            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);
             for (FileObserverStatusListener l : mListeners)
@@ -101,7 +102,7 @@ public class OwnCloudFileObserver extends FileObserver {
             return;
         }
         WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mOCAccount, mContext);
-        SynchronizeFileOperation sfo = new SynchronizeFileOperation(mFile.getRemotePath(), mStorage, mOCAccount, mContext);
+        SynchronizeFileOperation sfo = new SynchronizeFileOperation(mFile.getRemotePath(), mStorage, mOCAccount);
         RemoteOperationResult result = sfo.execute(wc);
         
         if (result.getExtraData() == Boolean.TRUE) {
@@ -135,5 +136,13 @@ public class OwnCloudFileObserver extends FileObserver {
                                                Account account,
                                                FileObserverStatusListener.Status status);
     }
+
+    public OCFile getOCFile() {
+        return mFile;
+    }
+
+    public Account getAccount() {
+        return mOCAccount;
+    }
     
 }