Context handling made consistent

diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java
index 5416bd9..8572124 100644 (file)
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -41,14 +41,14 @@ public class OwnCloudFileObserver extends FileObserver {
 
     public static int CHANGES_ONLY = CLOSE_WRITE;
     
 
     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;    // 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);
     
     public OwnCloudFileObserver(String path) {
         this(path, ALL_EVENTS);


@@ -101,7 +101,7 @@ public class OwnCloudFileObserver extends FileObserver {
             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.getRemotePath(), mStorage, mOCAccount);

         RemoteOperationResult result = sfo.execute(wc);
         
         if (result.getExtraData() == Boolean.TRUE) {
         RemoteOperationResult result = sfo.execute(wc);
         
         if (result.getExtraData() == Boolean.TRUE) {

diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index 70b6b21..41e4e52 100644 (file)
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -158,12 +158,12 @@ public class FileObserverService extends Service implements FileObserverStatusLi
             observer = mObservers.get(i);
             if (observer.getPath().equals(path))
                 duplicate = true;
             observer = mObservers.get(i);
             if (observer.getPath().equals(path))
                 duplicate = true;

-            observer.setContext(getBaseContext());
+            observer.setContext(getApplicationContext());

         }
         if (duplicate) return;
         observer = new OwnCloudFileObserver(path, OwnCloudFileObserver.CHANGES_ONLY);
         }
         if (duplicate) return;
         observer = new OwnCloudFileObserver(path, OwnCloudFileObserver.CHANGES_ONLY);

-        observer.setContext(getBaseContext());
-        Account account = AccountUtils.getCurrentOwnCloudAccount(getBaseContext());
+        observer.setContext(getApplicationContext());
+        Account account = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());

         observer.setAccount(account);
         FileDataStorageManager storage =
                 new FileDataStorageManager(account, getContentResolver());
         observer.setAccount(account);
         FileDataStorageManager storage =
                 new FileDataStorageManager(account, getContentResolver());

diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 62f6193..b25fa1b 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
 import android.accounts.Account;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
 import android.accounts.Account;

-import android.content.Context;

 import android.util.Log;
 
 import com.owncloud.android.datamodel.DataStorageManager;
 import android.util.Log;
 
 import com.owncloud.android.datamodel.DataStorageManager;


@@ -46,8 +45,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
     public SynchronizeFileOperation(
             String remotePath, 
             DataStorageManager dataStorageManager, 
     public SynchronizeFileOperation(
             String remotePath, 
             DataStorageManager dataStorageManager, 

-            Account account, 
-            Context context ) {
+            Account account) {

         mRemotePath = remotePath;
         mStorageManager = dataStorageManager;
         mAccount = account;
         mRemotePath = remotePath;
         mStorageManager = dataStorageManager;
         mAccount = account;