Replace account.name by newAccountName in onUpgrade

[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..2637f98 100644 (file)
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -374,9 +374,9 @@ public class FileContentProvider extends ContentProvider {
             ) {
         ContentValues fileValues = new ContentValues();
         fileValues.put(
             ) {
         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 " + 
                 ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
         );
         String whereShare = ProviderTableMeta.FILE_PATH + "=? AND " + 
                 ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";


@@ -843,20 +843,23 @@ public class FileContentProvider extends ContentProvider {
         boolean upgradedResult = true;
         boolean upgraded = false;
         try {
         boolean upgradedResult = true;
         boolean upgraded = false;
         try {

-            // get accounts ALREADY UPDATED from AccountManager
-                       Account[] accounts = AccountManager.get(getContext()).getAccountsByType(MainApp.getAccountType());
-            String serverUrl, username, oldAccountName;
+            // get accounts from AccountManager ( we cann't know if they are updated or not because
+            // of synchronicity problems)
+                       Account[] accounts = AccountManager.get(getContext()).getAccountsByType(
+                    MainApp.getAccountType());
+            String serverUrl, username, oldAccountName, newAccountName;

                        for (Account account : accounts) {
                 // build old 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);
                        for (Account account : accounts) {
                 // build old 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);

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

 
                 // update values in database
                 db.beginTransaction();
                 try{
                     ContentValues cv = new ContentValues();
 
                 // update values in database
                 db.beginTransaction();
                 try{
                     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 + "=?",


@@ -865,10 +868,10 @@ public class FileContentProvider extends ContentProvider {
                     db.setTransactionSuccessful();
 
                      Log_OC.d("SQL", "Updated account in database: old name == " + oldAccountName +
                     db.setTransactionSuccessful();
 
                      Log_OC.d("SQL", "Updated account in database: old name == " + oldAccountName +

-                             ", new name == " + account.name + " (" + num + " rows updated )");
+                             ", new name == " + newAccountName + " (" + num + " rows updated )");

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

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

 
                 } catch (SQLException e){
                     upgraded = false;
 
                 } catch (SQLException e){
                     upgraded = false;


@@ -888,26 +891,26 @@ public class FileContentProvider extends ContentProvider {
                                        String oldAccountName) {
         boolean upgradedResult = true;
         boolean upgraded = false;
                                        String oldAccountName) {
         boolean upgradedResult = true;
         boolean upgraded = false;

-        boolean renamedResult = true;

         boolean renamed = false;
 
         boolean renamed = false;
 

-        String selectQuery = "SELECT " + ProviderTableMeta._ID + " FROM " +
+        String selectQuery = "SELECT * FROM " +

                 ProviderTableMeta.FILE_TABLE_NAME +" WHERE " +
                 ProviderTableMeta.FILE_ACCOUNT_OWNER +"=? AND " +
                 ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL;";
 
                 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 });
+        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) {
         if (c.moveToFirst()) {
             // create storage path
             String oldAccountPath = FileStorageUtils.getSavePath(oldAccountName);
             String newAccountPath = FileStorageUtils.getSavePath(newAccountName);
 
             if (oldAccountPath != newAccountPath) {

+                // 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
+                renamed = oldAccountFolder.renameTo(newAccountFolder);
+
+                // update database

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


@@ -936,27 +939,7 @@ public class FileContentProvider extends ContentProvider {
                     }
                     upgradedResult = upgraded && upgradedResult;
 
                     }
                     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());
                 } while (c.moveToNext());

-
-                // remove old folder
-                if (renamed && upgradedResult) {
-                    File oldAccountFolder = new File(oldAccountPath);
-                    if (oldAccountFolder.exists()) {
-                        oldAccountFolder.delete();
-                    }
-                }

             }
         }
         c.close();
             }
         }
         c.close();