Merge pull request #479 from nextcloud/fixRemovingFileBug

fixed removing files #473

src/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -434,11 +434,10 @@ public class FileDataStorageManager {
 
 
     public boolean removeFile(OCFile file, boolean removeDBData, boolean removeLocalCopy) {
-        boolean success = false;
+        boolean success = true;
         if (file != null) {
             if (file.isFolder()) {
                 success = removeFolder(file, removeDBData, removeLocalCopy);
-
             } else {
                 if (removeDBData) {
                     //Uri file_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE,
@@ -456,7 +455,7 @@ public class FileDataStorageManager {
                     } else {
                         deleted = getContentResolver().delete(file_uri, where, whereArgs);
                     }
-                    success &= (deleted > 0);
+                    success = deleted > 0;
                 }
                 String localPath = file.getStoragePath();
                 if (removeLocalCopy && file.isDown() && localPath != null && success) {
@@ -472,6 +471,8 @@ public class FileDataStorageManager {
                     }
                 }
             }
+        } else {
+            return false;
         }
 
         return success;