Studying lack of upload when a file that was not previously down is set as favourite...

[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 70b6b21..44713d1 100644 (file)
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -158,17 +158,17 @@ 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.setStorageManager(storage);
         observer.setAccount(account);
         FileDataStorageManager storage =
                 new FileDataStorageManager(account, getContentResolver());
         observer.setStorageManager(storage);

-        observer.setOCFile(storage.getFileByLocalPath(path));
+        observer.setOCFile(storage.getFileByLocalPath(path));   // ISSUE 10 - the fix in FileDetailsFragment to avoid path == null was not enough; it the file was never down before, this sets a NULL OCFile in the observer 

         observer.addObserverStatusListener(this);
 
         DownloadCompletedReceiver receiver = new DownloadCompletedReceiver(path, observer);
         observer.addObserverStatusListener(this);
 
         DownloadCompletedReceiver receiver = new DownloadCompletedReceiver(path, observer);