Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / FileDataStorageManager.java

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index f461193..9933e36 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -25,12 +25,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
 import java.util.List;
 import java.util.Vector;
 

-import com.owncloud.android.DisplayUtils;

 import com.owncloud.android.Log_OC;
 import com.owncloud.android.Log_OC;

-import com.owncloud.android.db.ProviderMeta;
+import com.owncloud.android.MainApp;

 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.utils.FileStorageUtils;
 
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.utils.FileStorageUtils;
 

+

 import android.accounts.Account;
 import android.content.ContentProviderClient;
 import android.content.ContentProviderOperation;
 import android.accounts.Account;
 import android.content.ContentProviderClient;
 import android.content.ContentProviderOperation;


@@ -274,7 +274,7 @@ public class FileDataStorageManager implements DataStorageManager {
         ContentProviderResult[] results = null;
         try {
             if (getContentResolver() != null) {
         ContentProviderResult[] results = null;
         try {
             if (getContentResolver() != null) {

-                results = getContentResolver().applyBatch(ProviderMeta.AUTHORITY_FILES, operations);
+                results = getContentResolver().applyBatch(MainApp.getAuthority(), operations);

 
             } else {
                 results = getContentProvider().applyBatch(operations);
 
             } else {
                 results = getContentProvider().applyBatch(operations);


@@ -594,7 +594,7 @@ public class FileDataStorageManager implements DataStorageManager {
             /// 3. apply updates in batch
             try {
                 if (getContentResolver() != null) {
             /// 3. apply updates in batch
             try {
                 if (getContentResolver() != null) {

-                    getContentResolver().applyBatch(ProviderMeta.AUTHORITY_FILES, operations);
+                    getContentResolver().applyBatch(MainApp.getAuthority(), operations);

 
                 } else {
                     getContentProvider().applyBatch(operations);
 
                 } else {
                     getContentProvider().applyBatch(operations);


@@ -676,7 +676,6 @@ public class FileDataStorageManager implements DataStorageManager {
 
         while (parentId != 0) {
             
 
         while (parentId != 0) {
             

-            Log_OC.d(TAG, "parent = " + parentId);

             // Update the size of the parent
             calculateFolderSize(parentId);
             
             // Update the size of the parent
             calculateFolderSize(parentId);