Merge remote-tracking branch 'origin/oauth_login' into oauth_login

[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..73a03ec 100644 (file)
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -137,7 +137,7 @@ public class FileObserverService extends Service {
                 ProviderTableMeta.FILE_KEEP_IN_SYNC + " = ?",
                 new String[] {String.valueOf(1)},
                 null);
-        if (!c.moveToFirst()) return;
+        if (c == null || !c.moveToFirst()) return;
         AccountManager acm = AccountManager.get(this);
         Account[] accounts = acm.getAccounts();
         do {
@@ -155,9 +155,10 @@ public class FileObserverService extends Service {
                 continue;
 
             String path = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
+            if (path == null || path.length() <= 0)
+                continue;
             OwnCloudFileObserver observer =
                     new OwnCloudFileObserver(   path, 
-                                                storage.getFileByPath(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH))),
                                                 account, 
                                                 getApplicationContext(), 
                                                 OwnCloudFileObserver.CHANGES_ONLY);
@@ -197,8 +198,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);