Merge pull request #946 from owncloud/upgrading_account_manager

[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 cdf8729..8c24c03 100644 (file)
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -844,7 +844,7 @@ public class FileContentProvider extends ContentProvider {
                        Account[] accounts = AccountManager.get(getContext()).getAccountsByType(MainApp.getAccountType());
             String serverUrl, username, oldAccountName;
                        for (Account account : accounts) {
                        Account[] accounts = AccountManager.get(getContext()).getAccountsByType(MainApp.getAccountType());
             String serverUrl, username, oldAccountName;
                        for (Account account : accounts) {

-                // build new account name
+                // 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);
                 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);


@@ -852,11 +852,6 @@ public class FileContentProvider extends ContentProvider {
                 // update values in database
                 db.beginTransaction();
                 try{
                 // update values in database
                 db.beginTransaction();
                 try{

-//                    db.execSQL("UPDATE " + ProviderTableMeta.FILE_TABLE_NAME +
-//                            " SET " + ProviderTableMeta.FILE_ACCOUNT_OWNER + " ='" +
-//                            account.name + "' " +
-//                            " WHERE " + ProviderTableMeta.FILE_ACCOUNT_OWNER + " ='" +
-//                            oldAccountName + "' " );

                     ContentValues cv = new ContentValues();
                     cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, account.name);
                     int num = db.update(ProviderTableMeta.FILE_TABLE_NAME,
                     ContentValues cv = new ContentValues();
                     cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, account.name);
                     int num = db.update(ProviderTableMeta.FILE_TABLE_NAME,


@@ -866,7 +861,7 @@ public class FileContentProvider extends ContentProvider {
                     upgraded = true;
                     db.setTransactionSuccessful();
 
                     upgraded = true;
                     db.setTransactionSuccessful();
 

-                     Log_OC.i("SQL", "Updated account in database: old name == " + oldAccountName +
+                     Log_OC.d("SQL", "Updated account in database: old name == " + oldAccountName +

                              ", new name == " + account.name + " (" + num + " rows updated )");
                 } catch (SQLException e){
                     upgraded = false;
                              ", new name == " + account.name + " (" + num + " rows updated )");
                 } catch (SQLException e){
                     upgraded = false;