Merge branch 'master' of https://github.com/owncloud/android into material_fab

[pub/Android/ownCloud.git] / src / com / owncloud / android / providers / FileContentProvider.java

diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index b3b5346..70cd897 100644 (file)
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -23,6 +23,7 @@
 package com.owncloud.android.providers;
 
 import java.io.File;
 package com.owncloud.android.providers;
 
 import java.io.File;

+import java.security.Provider;

 import java.util.ArrayList;
 import java.util.HashMap;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 


@@ -92,7 +93,7 @@ public class FileContentProvider extends ContentProvider {
                 ProviderTableMeta.FILE_KEEP_IN_SYNC);
         mFileProjectionMap.put(ProviderTableMeta.FILE_ACCOUNT_OWNER,
                 ProviderTableMeta.FILE_ACCOUNT_OWNER);
                 ProviderTableMeta.FILE_KEEP_IN_SYNC);
         mFileProjectionMap.put(ProviderTableMeta.FILE_ACCOUNT_OWNER,
                 ProviderTableMeta.FILE_ACCOUNT_OWNER);

-        mFileProjectionMap.put(ProviderTableMeta.FILE_ETAG, 
+        mFileProjectionMap.put(ProviderTableMeta.FILE_ETAG,

                 ProviderTableMeta.FILE_ETAG);
         mFileProjectionMap.put(ProviderTableMeta.FILE_SHARE_BY_LINK,
                 ProviderTableMeta.FILE_SHARE_BY_LINK);
                 ProviderTableMeta.FILE_ETAG);
         mFileProjectionMap.put(ProviderTableMeta.FILE_SHARE_BY_LINK,
                 ProviderTableMeta.FILE_SHARE_BY_LINK);


@@ -114,7 +115,7 @@ public class FileContentProvider extends ContentProvider {
     private static final int SHARES = 4;
 
     private static final String TAG = FileContentProvider.class.getSimpleName();
     private static final int SHARES = 4;
 
     private static final String TAG = FileContentProvider.class.getSimpleName();

-    
+

     // Projection for ocshares table
     private static HashMap<String, String> mOCSharesProjectionMap;
     static {
     // Projection for ocshares table
     private static HashMap<String, String> mOCSharesProjectionMap;
     static {


@@ -149,9 +150,9 @@ public class FileContentProvider extends ContentProvider {
         mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER,
                 ProviderTableMeta.OCSHARES_ACCOUNT_OWNER);
     }
         mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER,
                 ProviderTableMeta.OCSHARES_ACCOUNT_OWNER);
     }

-    
+

     private UriMatcher mUriMatcher;
     private UriMatcher mUriMatcher;

-    
+

     @Override
     public int delete(Uri uri, String where, String[] whereArgs) {
         //Log_OC.d(TAG, "Deleting " + uri + " at provider " + this);
     @Override
     public int delete(Uri uri, String where, String[] whereArgs) {
         //Log_OC.d(TAG, "Deleting " + uri + " at provider " + this);


@@ -167,7 +168,7 @@ public class FileContentProvider extends ContentProvider {
         getContext().getContentResolver().notifyChange(uri, null);
         return count;
     }
         getContext().getContentResolver().notifyChange(uri, null);
         return count;
     }

-    
+

     private int delete(SQLiteDatabase db, Uri uri, String where, String[] whereArgs) {
         int count = 0;
         switch (mUriMatcher.match(uri)) {
     private int delete(SQLiteDatabase db, Uri uri, String where, String[] whereArgs) {
         int count = 0;
         switch (mUriMatcher.match(uri)) {


@@ -177,6 +178,7 @@ public class FileContentProvider extends ContentProvider {
             if (c != null && c.moveToFirst()) {
                 remoteId = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID));
                 //ThumbnailsCacheManager.removeFileFromCache(remoteId);
             if (c != null && c.moveToFirst()) {
                 remoteId = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID));
                 //ThumbnailsCacheManager.removeFileFromCache(remoteId);

+                c.close();

             }
             Log_OC.d(TAG, "Removing FILE " + remoteId);
 
             }
             Log_OC.d(TAG, "Removing FILE " + remoteId);
 


@@ -186,11 +188,6 @@ public class FileContentProvider extends ContentProvider {
                             + uri.getPathSegments().get(1)
                             + (!TextUtils.isEmpty(where) ? " AND (" + where
                                     + ")" : ""), whereArgs);
                             + uri.getPathSegments().get(1)
                             + (!TextUtils.isEmpty(where) ? " AND (" + where
                                     + ")" : ""), whereArgs);

-            /* just for log
-            if (c!=null) {
-                c.close();
-            }
-            */

             break;
         case DIRECTORY:
             // deletion of folder is recursive
             break;
         case DIRECTORY:
             // deletion of folder is recursive


@@ -206,7 +203,6 @@ public class FileContentProvider extends ContentProvider {
             if (children != null && children.moveToFirst())  {
                 long childId;
                 boolean isDir;
             if (children != null && children.moveToFirst())  {
                 long childId;
                 boolean isDir;

-                //String remotePath; 

                 while (!children.isAfterLast()) {
                     childId = children.getLong(children.getColumnIndex(ProviderTableMeta._ID));
                     isDir = "DIR".equals(children.getString(
                 while (!children.isAfterLast()) {
                     childId = children.getLong(children.getColumnIndex(ProviderTableMeta._ID));
                     isDir = "DIR".equals(children.getString(


@@ -215,16 +211,16 @@ public class FileContentProvider extends ContentProvider {
                     //remotePath = children.getString(children.getColumnIndex(ProviderTableMeta.FILE_PATH));
                     if (isDir) {
                         count += delete(
                     //remotePath = children.getString(children.getColumnIndex(ProviderTableMeta.FILE_PATH));
                     if (isDir) {
                         count += delete(

-                            db, 
-                            ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_DIR, childId), 
-                            null, 
+                            db,
+                            ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_DIR, childId),
+                            null,

                             null
                         );
                     } else {
                         count += delete(
                             null
                         );
                     } else {
                         count += delete(

-                            db, 
+                            db,

                             ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, childId),
                             ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, childId),

-                            null, 
+                            null,

                             null
                         );
                     }
                             null
                         );
                     }


@@ -288,7 +284,7 @@ public class FileContentProvider extends ContentProvider {
         getContext().getContentResolver().notifyChange(newUri, null);
         return newUri;
     }
         getContext().getContentResolver().notifyChange(newUri, null);
         return newUri;
     }

-    
+

     private Uri insert(SQLiteDatabase db, Uri uri, ContentValues values) {
         switch (mUriMatcher.match(uri)){
         case ROOT_DIRECTORY:
     private Uri insert(SQLiteDatabase db, Uri uri, ContentValues values) {
         switch (mUriMatcher.match(uri)){
         case ROOT_DIRECTORY:


@@ -296,19 +292,22 @@ public class FileContentProvider extends ContentProvider {
             String remotePath = values.getAsString(ProviderTableMeta.FILE_PATH);
             String accountName = values.getAsString(ProviderTableMeta.FILE_ACCOUNT_OWNER);
             String[] projection = new String[] {
             String remotePath = values.getAsString(ProviderTableMeta.FILE_PATH);
             String accountName = values.getAsString(ProviderTableMeta.FILE_ACCOUNT_OWNER);
             String[] projection = new String[] {

-                    ProviderTableMeta._ID, ProviderTableMeta.FILE_PATH, 
-                    ProviderTableMeta.FILE_ACCOUNT_OWNER 
+                    ProviderTableMeta._ID, ProviderTableMeta.FILE_PATH,
+                    ProviderTableMeta.FILE_ACCOUNT_OWNER

             };
             };

-            String where = ProviderTableMeta.FILE_PATH + "=? AND " + 
+            String where = ProviderTableMeta.FILE_PATH + "=? AND " +

                     ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
             String[] whereArgs = new String[] {remotePath, accountName};
             Cursor doubleCheck = query(db, uri, projection, where, whereArgs, null);
                     ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
             String[] whereArgs = new String[] {remotePath, accountName};
             Cursor doubleCheck = query(db, uri, projection, where, whereArgs, null);

-            // ugly patch; serious refactorization is needed to reduce work in 
+            // ugly patch; serious refactorization is needed to reduce work in

             // FileDataStorageManager and bring it to FileContentProvider
             // FileDataStorageManager and bring it to FileContentProvider

-            if (doubleCheck == null || !doubleCheck.moveToFirst()) {     
+            if (doubleCheck == null || !doubleCheck.moveToFirst()) {
+                if (doubleCheck != null) {
+                    doubleCheck.close();
+                }

                 long rowId = db.insert(ProviderTableMeta.FILE_TABLE_NAME, null, values);
                 if (rowId > 0) {
                 long rowId = db.insert(ProviderTableMeta.FILE_TABLE_NAME, null, values);
                 if (rowId > 0) {

-                    Uri insertedFileUri = 
+                    Uri insertedFileUri =

                             ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, rowId);
                     return insertedFileUri;
                 } else {
                             ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, rowId);
                     return insertedFileUri;
                 } else {


@@ -317,33 +316,36 @@ public class FileContentProvider extends ContentProvider {
             } else {
                 // file is already inserted; race condition, let's avoid a duplicated entry
                 Uri insertedFileUri = ContentUris.withAppendedId(
             } else {
                 // file is already inserted; race condition, let's avoid a duplicated entry
                 Uri insertedFileUri = ContentUris.withAppendedId(

-                        ProviderTableMeta.CONTENT_URI_FILE, 
+                        ProviderTableMeta.CONTENT_URI_FILE,

                         doubleCheck.getLong(doubleCheck.getColumnIndex(ProviderTableMeta._ID))
                 );
                 doubleCheck.close();
 
                 return insertedFileUri;
             }
                         doubleCheck.getLong(doubleCheck.getColumnIndex(ProviderTableMeta._ID))
                 );
                 doubleCheck.close();
 
                 return insertedFileUri;
             }

-            
+

         case SHARES:
             String path = values.getAsString(ProviderTableMeta.OCSHARES_PATH);
             String accountNameShare= values.getAsString(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER);
             String[] projectionShare = new String[] {
         case SHARES:
             String path = values.getAsString(ProviderTableMeta.OCSHARES_PATH);
             String accountNameShare= values.getAsString(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER);
             String[] projectionShare = new String[] {

-                    ProviderTableMeta._ID, ProviderTableMeta.OCSHARES_PATH, 
-                    ProviderTableMeta.OCSHARES_ACCOUNT_OWNER 
+                    ProviderTableMeta._ID, ProviderTableMeta.OCSHARES_PATH,
+                    ProviderTableMeta.OCSHARES_ACCOUNT_OWNER

             };
             };

-            String whereShare = ProviderTableMeta.OCSHARES_PATH + "=? AND " + 
+            String whereShare = ProviderTableMeta.OCSHARES_PATH + "=? AND " +

                     ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
             String[] whereArgsShare = new String[] {path, accountNameShare};
             Uri insertedShareUri = null;
                     ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
             String[] whereArgsShare = new String[] {path, accountNameShare};
             Uri insertedShareUri = null;

-            Cursor doubleCheckShare = 
+            Cursor doubleCheckShare =

                     query(db, uri, projectionShare, whereShare, whereArgsShare, null);
                     query(db, uri, projectionShare, whereShare, whereArgsShare, null);

-            // ugly patch; serious refactorization is needed to reduce work in 
+            // ugly patch; serious refactorization is needed to reduce work in

             // FileDataStorageManager and bring it to FileContentProvider
             // FileDataStorageManager and bring it to FileContentProvider

-            if (doubleCheckShare == null || !doubleCheckShare.moveToFirst()) {     
+            if (doubleCheckShare == null || !doubleCheckShare.moveToFirst()) {
+                if (doubleCheckShare != null) {
+                    doubleCheckShare.close();
+                }

                 long rowId = db.insert(ProviderTableMeta.OCSHARES_TABLE_NAME, null, values);
                 if (rowId >0) {
                 long rowId = db.insert(ProviderTableMeta.OCSHARES_TABLE_NAME, null, values);
                 if (rowId >0) {

-                    insertedShareUri = 
+                    insertedShareUri =

                             ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, rowId);
                 } else {
                     throw new SQLException("ERROR " + uri);
                             ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, rowId);
                 } else {
                     throw new SQLException("ERROR " + uri);


@@ -352,7 +354,7 @@ public class FileContentProvider extends ContentProvider {
             } else {
                 // file is already inserted; race condition, let's avoid a duplicated entry
                 insertedShareUri = ContentUris.withAppendedId(
             } else {
                 // file is already inserted; race condition, let's avoid a duplicated entry
                 insertedShareUri = ContentUris.withAppendedId(

-                        ProviderTableMeta.CONTENT_URI_SHARE, 
+                        ProviderTableMeta.CONTENT_URI_SHARE,

                         doubleCheckShare.getLong(
                                 doubleCheckShare.getColumnIndex(ProviderTableMeta._ID)
                         )
                         doubleCheckShare.getLong(
                                 doubleCheckShare.getColumnIndex(ProviderTableMeta._ID)
                         )


@@ -361,37 +363,37 @@ public class FileContentProvider extends ContentProvider {
             }
             updateFilesTableAccordingToShareInsertion(db, uri, values);
             return insertedShareUri;
             }
             updateFilesTableAccordingToShareInsertion(db, uri, values);
             return insertedShareUri;

-            
+

 
         default:
             throw new IllegalArgumentException("Unknown uri id: " + uri);
         }
 
         default:
             throw new IllegalArgumentException("Unknown uri id: " + uri);
         }

-        
+

     }
     }

-    
+

     private void updateFilesTableAccordingToShareInsertion(
             SQLiteDatabase db, Uri uri, ContentValues shareValues
             ) {
         ContentValues fileValues = new ContentValues();
         fileValues.put(
     private void updateFilesTableAccordingToShareInsertion(
             SQLiteDatabase db, Uri uri, ContentValues shareValues
             ) {
         ContentValues fileValues = new ContentValues();
         fileValues.put(

-                ProviderTableMeta.FILE_SHARE_BY_LINK, 
-                ShareType.PUBLIC_LINK.getValue() == 
-                    shareValues.getAsInteger(ProviderTableMeta.OCSHARES_SHARE_TYPE)? 1 : 0
+                ProviderTableMeta.FILE_SHARE_BY_LINK,
+                ShareType.PUBLIC_LINK.getValue() ==
+                        shareValues.getAsInteger(ProviderTableMeta.OCSHARES_SHARE_TYPE) ? 1 : 0

         );
         );

-        String whereShare = ProviderTableMeta.FILE_PATH + "=? AND " + 
+        String whereShare = ProviderTableMeta.FILE_PATH + "=? AND " +

                 ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
         String[] whereArgsShare = new String[] {
                 ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
         String[] whereArgsShare = new String[] {

-                shareValues.getAsString(ProviderTableMeta.OCSHARES_PATH), 
+                shareValues.getAsString(ProviderTableMeta.OCSHARES_PATH),

                 shareValues.getAsString(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER)
         };
         db.update(ProviderTableMeta.FILE_TABLE_NAME, fileValues, whereShare, whereArgsShare);
     }
                 shareValues.getAsString(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER)
         };
         db.update(ProviderTableMeta.FILE_TABLE_NAME, fileValues, whereShare, whereArgsShare);
     }

-    
+

 
     @Override
     public boolean onCreate() {
         mDbHelper = new DataBaseHelper(getContext());
 
     @Override
     public boolean onCreate() {
         mDbHelper = new DataBaseHelper(getContext());

-        
+

         String authority = getContext().getResources().getString(R.string.authority);
         mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(authority, null, ROOT_DIRECTORY);
         String authority = getContext().getResources().getString(R.string.authority);
         mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(authority, null, ROOT_DIRECTORY);


@@ -401,20 +403,20 @@ public class FileContentProvider extends ContentProvider {
         mUriMatcher.addURI(authority, "dir/#", DIRECTORY);
         mUriMatcher.addURI(authority, "shares/", SHARES);
         mUriMatcher.addURI(authority, "shares/#", SHARES);
         mUriMatcher.addURI(authority, "dir/#", DIRECTORY);
         mUriMatcher.addURI(authority, "shares/", SHARES);
         mUriMatcher.addURI(authority, "shares/#", SHARES);

-        
+

         return true;
     }
 
         return true;
     }
 

-    
+

     @Override
     public Cursor query(
     @Override
     public Cursor query(

-            Uri uri, 
-            String[] projection, 
-            String selection, 
-            String[] selectionArgs, 
+            Uri uri,
+            String[] projection,
+            String selection,
+            String[] selectionArgs,

             String sortOrder
         ) {
             String sortOrder
         ) {

-        
+

         Cursor result = null;
         SQLiteDatabase db = mDbHelper.getReadableDatabase();
         db.beginTransaction();
         Cursor result = null;
         SQLiteDatabase db = mDbHelper.getReadableDatabase();
         db.beginTransaction();


@@ -426,16 +428,16 @@ public class FileContentProvider extends ContentProvider {
         }
         return result;
     }
         }
         return result;
     }

-    
+

     private Cursor query(
     private Cursor query(

-            SQLiteDatabase db, 
-            Uri uri, 
-            String[] projection, 
-            String selection, 
-            String[] selectionArgs, 
+            SQLiteDatabase db,
+            Uri uri,
+            String[] projection,
+            String selection,
+            String[] selectionArgs,

             String sortOrder
         ) {
             String sortOrder
         ) {

-        
+

         SQLiteQueryBuilder sqlQuery = new SQLiteQueryBuilder();
 
         sqlQuery.setTables(ProviderTableMeta.FILE_TABLE_NAME);
         SQLiteQueryBuilder sqlQuery = new SQLiteQueryBuilder();
 
         sqlQuery.setTables(ProviderTableMeta.FILE_TABLE_NAME);


@@ -455,7 +457,7 @@ public class FileContentProvider extends ContentProvider {
                         + uri.getPathSegments().get(1));
             }
             break;
                         + uri.getPathSegments().get(1));
             }
             break;

-        case SHARES: 
+        case SHARES:

             sqlQuery.setTables(ProviderTableMeta.OCSHARES_TABLE_NAME);
             sqlQuery.setProjectionMap(mOCSharesProjectionMap);
             if (uri.getPathSegments().size() > 1) {
             sqlQuery.setTables(ProviderTableMeta.OCSHARES_TABLE_NAME);
             sqlQuery.setProjectionMap(mOCSharesProjectionMap);
             if (uri.getPathSegments().size() > 1) {


@@ -488,7 +490,7 @@ public class FileContentProvider extends ContentProvider {
 
     @Override
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
 
     @Override
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {

-        
+

         int count = 0;
         SQLiteDatabase db = mDbHelper.getWritableDatabase();
         db.beginTransaction();
         int count = 0;
         SQLiteDatabase db = mDbHelper.getWritableDatabase();
         db.beginTransaction();


@@ -501,14 +503,14 @@ public class FileContentProvider extends ContentProvider {
         getContext().getContentResolver().notifyChange(uri, null);
         return count;
     }
         getContext().getContentResolver().notifyChange(uri, null);
         return count;
     }

-    
-    
+
+

 
     private int update(
 
     private int update(

-            SQLiteDatabase db, 
-            Uri uri, 
-            ContentValues values, 
-            String selection, 
+            SQLiteDatabase db,
+            Uri uri,
+            ContentValues values,
+            String selection,

             String[] selectionArgs
         ) {
         switch (mUriMatcher.match(uri)) {
             String[] selectionArgs
         ) {
         switch (mUriMatcher.match(uri)) {


@@ -523,14 +525,14 @@ public class FileContentProvider extends ContentProvider {
                         ProviderTableMeta.FILE_TABLE_NAME, values, selection, selectionArgs
                 );
         }
                         ProviderTableMeta.FILE_TABLE_NAME, values, selection, selectionArgs
                 );
         }

-    }    
+    }

 
 

- /*   
+ /*

     private int updateFolderSize(SQLiteDatabase db, String folderId) {
         int count = 0;
         String [] whereArgs = new String[] { folderId };
     private int updateFolderSize(SQLiteDatabase db, String folderId) {
         int count = 0;
         String [] whereArgs = new String[] { folderId };

-        
-        // read current size saved for the folder 
+
+        // read current size saved for the folder

         long folderSize = 0;
         long folderParentId = -1;
         Uri selectFolderUri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, folderId);
         long folderSize = 0;
         long folderParentId = -1;
         Uri selectFolderUri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, folderId);


@@ -542,7 +544,7 @@ public class FileContentProvider extends ContentProvider {
             folderParentId = folderCursor.getLong(folderCursor.getColumnIndex(ProviderTableMeta.FILE_PARENT));;
         }
         folderCursor.close();
             folderParentId = folderCursor.getLong(folderCursor.getColumnIndex(ProviderTableMeta.FILE_PARENT));;
         }
         folderCursor.close();

-        
+

         // read and sum sizes of children
         long childrenSize = 0;
         Uri selectChildrenUri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, folderId);
         // read and sum sizes of children
         long childrenSize = 0;
         Uri selectChildrenUri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, folderId);


@@ -556,14 +558,14 @@ public class FileContentProvider extends ContentProvider {
             }
         }
         childrenCursor.close();
             }
         }
         childrenCursor.close();

-        
+

         // update if needed
         if (folderSize != childrenSize) {
             Log_OC.d("FileContentProvider", "Updating " + folderSize + " to " + childrenSize);
             ContentValues cv = new ContentValues();
             cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, childrenSize);
             count = db.update(ProviderTableMeta.FILE_TABLE_NAME, cv, folderWhere, whereArgs);
         // update if needed
         if (folderSize != childrenSize) {
             Log_OC.d("FileContentProvider", "Updating " + folderSize + " to " + childrenSize);
             ContentValues cv = new ContentValues();
             cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, childrenSize);
             count = db.update(ProviderTableMeta.FILE_TABLE_NAME, cv, folderWhere, whereArgs);

-            
+

             // propagate update until root
             if (folderParentId > FileDataStorageManager.ROOT_PARENT_ID) {
                 Log_OC.d("FileContentProvider", "Propagating update to " + folderParentId);
             // propagate update until root
             if (folderParentId > FileDataStorageManager.ROOT_PARENT_ID) {
                 Log_OC.d("FileContentProvider", "Propagating update to " + folderParentId);


@@ -577,15 +579,15 @@ public class FileContentProvider extends ContentProvider {
         return count;
     }
 */
         return count;
     }
 */

-    
+

     @Override
     @Override

-    public ContentProviderResult[] applyBatch (ArrayList<ContentProviderOperation> operations) 
+    public ContentProviderResult[] applyBatch (ArrayList<ContentProviderOperation> operations)

             throws OperationApplicationException {
             throws OperationApplicationException {

-        Log_OC.d("FileContentProvider", "applying batch in provider " + this + 
+        Log_OC.d("FileContentProvider", "applying batch in provider " + this +

                 " (temporary: " + isTemporary() + ")" );
         ContentProviderResult[] results = new ContentProviderResult[operations.size()];
         int i=0;
                 " (temporary: " + isTemporary() + ")" );
         ContentProviderResult[] results = new ContentProviderResult[operations.size()];
         int i=0;

-        
+

         SQLiteDatabase db = mDbHelper.getWritableDatabase();
         db.beginTransaction();  // it's supposed that transactions can be nested
         try {
         SQLiteDatabase db = mDbHelper.getWritableDatabase();
         db.beginTransaction();  // it's supposed that transactions can be nested
         try {


@@ -628,7 +630,7 @@ public class FileContentProvider extends ContentProvider {
                     + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER, "
                     + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA + " INTEGER, "
                     + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " INTEGER, "
                     + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER, "
                     + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA + " INTEGER, "
                     + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " INTEGER, "

-                    + ProviderTableMeta.FILE_ETAG + " TEXT, " 
+                    + ProviderTableMeta.FILE_ETAG + " TEXT, "

                     + ProviderTableMeta.FILE_SHARE_BY_LINK + " INTEGER, "
                     + ProviderTableMeta.FILE_PUBLIC_LINK  + " TEXT, "
                     + ProviderTableMeta.FILE_PERMISSIONS  + " TEXT null,"
                     + ProviderTableMeta.FILE_SHARE_BY_LINK + " INTEGER, "
                     + ProviderTableMeta.FILE_PUBLIC_LINK  + " TEXT, "
                     + ProviderTableMeta.FILE_PERMISSIONS  + " TEXT null,"


@@ -636,7 +638,7 @@ public class FileContentProvider extends ContentProvider {
                     + ProviderTableMeta.FILE_UPDATE_THUMBNAIL  + " INTEGER," //boolean
                     + ProviderTableMeta.FILE_IS_DOWNLOADING  + " INTEGER);" //boolean
                     );
                     + ProviderTableMeta.FILE_UPDATE_THUMBNAIL  + " INTEGER," //boolean
                     + ProviderTableMeta.FILE_IS_DOWNLOADING  + " INTEGER);" //boolean
                     );

-            
+

             // Create table ocshares
             db.execSQL("CREATE TABLE " + ProviderTableMeta.OCSHARES_TABLE_NAME + "("
                     + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "
             // Create table ocshares
             db.execSQL("CREATE TABLE " + ProviderTableMeta.OCSHARES_TABLE_NAME + "("
                     + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "


@@ -652,14 +654,14 @@ public class FileContentProvider extends ContentProvider {
                     + ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME + " TEXT, "
                     + ProviderTableMeta.OCSHARES_IS_DIRECTORY + " INTEGER, "  // boolean
                     + ProviderTableMeta.OCSHARES_USER_ID + " INTEGER, "
                     + ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME + " TEXT, "
                     + ProviderTableMeta.OCSHARES_IS_DIRECTORY + " INTEGER, "  // boolean
                     + ProviderTableMeta.OCSHARES_USER_ID + " INTEGER, "

-                    + ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + " INTEGER," 
+                    + ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + " INTEGER,"

                     + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + " TEXT );" );
         }
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             Log_OC.i("SQL", "Entering in onUpgrade");
                     + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + " TEXT );" );
         }
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             Log_OC.i("SQL", "Entering in onUpgrade");

-            boolean upgraded = false; 
+            boolean upgraded = false;

             if (oldVersion == 1 && newVersion >= 2) {
                 Log_OC.i("SQL", "Entering in the #1 ADD in onUpgrade");
                 db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
             if (oldVersion == 1 && newVersion >= 2) {
                 Log_OC.i("SQL", "Entering in the #1 ADD in onUpgrade");
                 db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +


@@ -672,15 +674,15 @@ public class FileContentProvider extends ContentProvider {
                 db.beginTransaction();
                 try {
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                 db.beginTransaction();
                 try {
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +

-                               " ADD COLUMN " + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA  + 
+                               " ADD COLUMN " + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA  +

                                " INTEGER " + " DEFAULT 0");
                                " INTEGER " + " DEFAULT 0");

-                    
+

                     // assume there are not local changes pending to upload
                     // assume there are not local changes pending to upload

-                    db.execSQL("UPDATE " + ProviderTableMeta.FILE_TABLE_NAME + 
-                            " SET " + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA + " = " 
-                            + System.currentTimeMillis() + 
+                    db.execSQL("UPDATE " + ProviderTableMeta.FILE_TABLE_NAME +
+                            " SET " + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA + " = "
+                            + System.currentTimeMillis() +

                             " WHERE " + ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL");
                             " WHERE " + ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL");

-                 
+

                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {
                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {


@@ -694,12 +696,12 @@ public class FileContentProvider extends ContentProvider {
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA +
                             " INTEGER " + " DEFAULT 0");
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA +
                             " INTEGER " + " DEFAULT 0");

-                
-                    db.execSQL("UPDATE " + ProviderTableMeta.FILE_TABLE_NAME + 
+
+                    db.execSQL("UPDATE " + ProviderTableMeta.FILE_TABLE_NAME +

                            " SET " + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " = " +
                             ProviderTableMeta.FILE_MODIFIED +
                            " WHERE " + ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL");
                            " SET " + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " = " +
                             ProviderTableMeta.FILE_MODIFIED +
                            " WHERE " + ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL");

-                
+

                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {
                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {


@@ -707,9 +709,9 @@ public class FileContentProvider extends ContentProvider {
                 }
             }
             if (!upgraded)
                 }
             }
             if (!upgraded)

-                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + 
+                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +

                         ", newVersion == " + newVersion);
                         ", newVersion == " + newVersion);

-        
+

             if (oldVersion < 5 && newVersion >= 5) {
                 Log_OC.i("SQL", "Entering in the #4 ADD in onUpgrade");
                 db.beginTransaction();
             if (oldVersion < 5 && newVersion >= 5) {
                 Log_OC.i("SQL", "Entering in the #4 ADD in onUpgrade");
                 db.beginTransaction();


@@ -717,7 +719,7 @@ public class FileContentProvider extends ContentProvider {
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_ETAG + " TEXT " +
                             " DEFAULT NULL");
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_ETAG + " TEXT " +
                             " DEFAULT NULL");

-                    
+

                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {
                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {


@@ -725,7 +727,7 @@ public class FileContentProvider extends ContentProvider {
                 }
             }
             if (!upgraded)
                 }
             }
             if (!upgraded)

-                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + 
+                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +

                         ", newVersion == " + newVersion);
 
             if (oldVersion < 6 && newVersion >= 6) {
                         ", newVersion == " + newVersion);
 
             if (oldVersion < 6 && newVersion >= 6) {


@@ -735,7 +737,7 @@ public class FileContentProvider extends ContentProvider {
                     db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_SHARE_BY_LINK + " INTEGER " +
                             " DEFAULT 0");
                     db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_SHARE_BY_LINK + " INTEGER " +
                             " DEFAULT 0");

-                    
+

                     db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_PUBLIC_LINK + " TEXT " +
                             " DEFAULT NULL");
                     db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_PUBLIC_LINK + " TEXT " +
                             " DEFAULT NULL");


@@ -765,7 +767,7 @@ public class FileContentProvider extends ContentProvider {
                 }
             }
             if (!upgraded)
                 }
             }
             if (!upgraded)

-                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + 
+                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +

                         ", newVersion == " + newVersion);
 
             if (oldVersion < 7 && newVersion >= 7) {
                         ", newVersion == " + newVersion);
 
             if (oldVersion < 7 && newVersion >= 7) {


@@ -779,7 +781,7 @@ public class FileContentProvider extends ContentProvider {
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_REMOTE_ID + " TEXT " +
                             " DEFAULT NULL");
                     db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
                             " ADD COLUMN " + ProviderTableMeta.FILE_REMOTE_ID + " TEXT " +
                             " DEFAULT NULL");

-                    
+

                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {
                     upgraded = true;
                     db.setTransactionSuccessful();
                 } finally {


@@ -787,7 +789,7 @@ public class FileContentProvider extends ContentProvider {
                 }
             }
             if (!upgraded)
                 }
             }
             if (!upgraded)

-                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + 
+                Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +

                         ", newVersion == " + newVersion);
 
             if (oldVersion < 8 && newVersion >= 8) {
                         ", newVersion == " + newVersion);
 
             if (oldVersion < 8 && newVersion >= 8) {


@@ -828,7 +830,8 @@ public class FileContentProvider extends ContentProvider {
 
             if (oldVersion < 10 && newVersion >= 10) {
                 Log_OC.i("SQL", "Entering in the #10 ADD in onUpgrade");
 
             if (oldVersion < 10 && newVersion >= 10) {
                 Log_OC.i("SQL", "Entering in the #10 ADD in onUpgrade");

-                upgraded = updateAccountName(db);
+                updateAccountName(db);
+                upgraded = true;

             }
              if (!upgraded)
                 Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +
             }
              if (!upgraded)
                 Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion +


@@ -837,77 +840,94 @@ public class FileContentProvider extends ContentProvider {
     }
 
 
     }
 
 

-    private boolean updateAccountName(SQLiteDatabase db){
+    /**
+     * Version 10 of database does not modify its scheme. It coincides with the upgrade of the ownCloud account names
+     * structure to include in it the path to the server instance. Updating the account names and path to local files
+     * in the files table is a must to keep the existing account working and the database clean.
+     *
+     * See {@link com.owncloud.android.authentication.AccountUtils#updateAccountVersion(android.content.Context)}
+     *
+     * @param db        Database where table of files is included.
+     */
+    private void updateAccountName(SQLiteDatabase db){

         Log_OC.d("SQL", "THREAD:  "+ Thread.currentThread().getName());
         AccountManager ama = AccountManager.get(getContext());
         Log_OC.d("SQL", "THREAD:  "+ Thread.currentThread().getName());
         AccountManager ama = AccountManager.get(getContext());

-        boolean upgradedResult = true;
-        boolean upgraded = false;

         try {
         try {

-            // get accounts ALREADY UPDATED from AccountManager
-                       Account[] accounts = AccountManager.get(getContext()).getAccountsByType(MainApp.getAccountType());
-            String serverUrl, username, oldAccountName;
+            // get accounts from AccountManager ;  we can't be sure if accounts in it are updated or not although
+            // we know the update was previously done in {link @FileActivity#onCreate} because the changes through
+            // AccountManager are not synchronous
+            Account[] accounts = AccountManager.get(getContext()).getAccountsByType(
+                    MainApp.getAccountType());
+            String serverUrl, username, oldAccountName, newAccountName;

                        for (Account account : accounts) {
                        for (Account account : accounts) {

-                // build old account name
+                // build both old and new account name

                 serverUrl = ama.getUserData(account, AccountUtils.Constants.KEY_OC_BASE_URL);
                 username = account.name.substring(0, account.name.lastIndexOf('@'));
                 oldAccountName = AccountUtils.buildAccountNameOld(Uri.parse(serverUrl), username);
                 serverUrl = ama.getUserData(account, AccountUtils.Constants.KEY_OC_BASE_URL);
                 username = account.name.substring(0, account.name.lastIndexOf('@'));
                 oldAccountName = AccountUtils.buildAccountNameOld(Uri.parse(serverUrl), username);

+                newAccountName = AccountUtils.buildAccountName(Uri.parse(serverUrl), username);

 
                 // update values in database
                 db.beginTransaction();
 
                 // update values in database
                 db.beginTransaction();

-                try{
+                try {

                     ContentValues cv = new ContentValues();
                     ContentValues cv = new ContentValues();

-                    cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, account.name);
+                    cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, newAccountName);

                     int num = db.update(ProviderTableMeta.FILE_TABLE_NAME,
                             cv,
                             ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",
                     int num = db.update(ProviderTableMeta.FILE_TABLE_NAME,
                             cv,
                             ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",

-                            new String[]{ oldAccountName });
-                    upgraded = true;
-                    db.setTransactionSuccessful();
+                            new String[]{oldAccountName});

 
 

-                     Log_OC.d("SQL", "Updated account in database: old name == " + oldAccountName +
-                             ", new name == " + account.name + " (" + num + " rows updated )");
+                    Log_OC.d("SQL", "Updated account in database: old name == " + oldAccountName +
+                            ", new name == " + newAccountName + " (" + num + " rows updated )");

 
                     // update path for downloaded files
 
                     // update path for downloaded files

-                    upgraded = updateDownloadedFiles(db, account.name, oldAccountName);
+                    updateDownloadedFiles(db, newAccountName, oldAccountName);

 
 

-                } catch (SQLException e){
-                    upgraded = false;
+                    db.setTransactionSuccessful();
+
+                } catch (SQLException e) {
+                    Log_OC.e(TAG, "SQL Exception upgrading account names or paths in database", e);

                 } finally {
                     db.endTransaction();
                 }
                 } finally {
                     db.endTransaction();
                 }

-                upgradedResult = upgraded && upgradedResult;

                        }
                        }

-               } catch (Exception e) {
-                       Log_OC.i("Exception", "Exception:" + e);
-               }
-
-        return upgradedResult;
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Exception upgrading account names or paths in database", e);
+        }

     }
 
     }
 

-    private boolean updateDownloadedFiles(SQLiteDatabase db, String newAccountName,
+
+    /**
+     * Rename the local ownCloud folder of one account to match the a rename of the account itself. Updates the
+     * table of files in database so that the paths to the local files keep being the same.
+     *
+     * @param db                    Database where table of files is included.
+     * @param newAccountName        New name for the target OC account.
+     * @param oldAccountName        Old name of the target OC account.
+     */
+    private void updateDownloadedFiles(SQLiteDatabase db, String newAccountName,

                                        String oldAccountName) {
                                        String oldAccountName) {

-        boolean upgradedResult = true;
-        boolean upgraded = false;
-        boolean renamedResult = true;
-        boolean renamed = false;
-
-        String selectQuery = "SELECT " + ProviderTableMeta._ID + " FROM " +
-                ProviderTableMeta.FILE_TABLE_NAME +" WHERE " +
-                ProviderTableMeta.FILE_ACCOUNT_OWNER +"=? AND " +
-                ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL;";
-
-        Cursor c = db.rawQuery(selectQuery, new String[] { newAccountName });
-        if (c.moveToFirst()) {
-            // create storage path
-            String oldAccountPath = FileStorageUtils.getSavePath(oldAccountName);
-            String newAccountPath = FileStorageUtils.getSavePath(newAccountName);
-
-            if (oldAccountPath != newAccountPath) {
+
+        String whereClause = ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " +
+                ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL";
+
+        Cursor c = db.query(ProviderTableMeta.FILE_TABLE_NAME,
+                null,
+                whereClause,
+                new String[] { newAccountName },
+                null, null, null);
+
+        try {
+            if (c.moveToFirst()) {
+                // create storage path
+                String oldAccountPath = FileStorageUtils.getSavePath(oldAccountName);
+                String newAccountPath = FileStorageUtils.getSavePath(newAccountName);
+
+                // move files
+                File oldAccountFolder = new File(oldAccountPath);

                 File newAccountFolder = new File(newAccountPath);
                 File newAccountFolder = new File(newAccountPath);

-                if (!newAccountFolder.exists()) {
-                    newAccountFolder.mkdirs();
-                }
-                // update  file and database
+                oldAccountFolder.renameTo(newAccountFolder);
+
+                // update database

                 do {
                     // Update database
                     String oldPath = c.getString(
                 do {
                     // Update database
                     String oldPath = c.getString(


@@ -916,51 +936,22 @@ public class FileContentProvider extends ContentProvider {
                             c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH)));
                     String newPath = FileStorageUtils.getDefaultSavePathFor(newAccountName, file);
 
                             c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH)));
                     String newPath = FileStorageUtils.getDefaultSavePathFor(newAccountName, file);
 

-                    db.beginTransaction();
-                    try {
-                        ContentValues cv = new ContentValues();
-                        cv.put(ProviderTableMeta.FILE_STORAGE_PATH, newPath);
-                        db.update(ProviderTableMeta.FILE_TABLE_NAME,
-                                cv,
-                                ProviderTableMeta.FILE_STORAGE_PATH + "=?",
-                                new String[]{oldPath});
-                        upgraded = true;
-                        db.setTransactionSuccessful();
-
-                        Log_OC.d("SQL", "Updated downloaded files: old file name == " + oldPath +
-                                ", new file name == " + newPath);
-                    } catch (SQLException e) {
-                        upgraded = false;
-                    } finally {
-                        db.endTransaction();
-                    }
-                    upgradedResult = upgraded && upgradedResult;
-
-                    // move file
-                    File oldFile = new File(oldPath);
-                    renamed = false;
-                    if (oldFile.exists()) {
-                        File newFile = new File(newPath);
-                        File newFolder = newFile.getParentFile();
-                        if (!newFolder.exists()) {
-                            newFolder.mkdirs();
-                        }
-                        renamed = newFile.renameTo(newFile);
-                    }
-                    renamedResult = renamed && renamedResult;
-                } while (c.moveToNext());
+                    ContentValues cv = new ContentValues();
+                    cv.put(ProviderTableMeta.FILE_STORAGE_PATH, newPath);
+                    db.update(ProviderTableMeta.FILE_TABLE_NAME,
+                            cv,
+                            ProviderTableMeta.FILE_STORAGE_PATH + "=?",
+                            new String[]{oldPath});

 
 

-                // remove old folder
-                if (renamed && upgradedResult) {
-                    File oldAccountFolder = new File(oldAccountPath);
-                    if (oldAccountFolder.exists()) {
-                        oldAccountFolder.delete();
-                    }
-                }
+                    Log_OC.v("SQL", "Updated path of downloaded file: old file name == " + oldPath +
+                            ", new file name == " + newPath);
+
+                } while (c.moveToNext());

             }
             }

+        } finally {
+            c.close();

         }
         }

-        c.close();

 
 

-        return (renamed && upgradedResult);

     }
     }

+

 }
 }