From: masensio <masensio@solidgear.es>
Date: Wed, 15 Apr 2015 11:07:14 +0000 (+0200)
Subject: Merge pull request #946 from owncloud/upgrading_account_manager
X-Git-Tag: test~30^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d9e22f0752ceca1830a5367e9b3ff33fc65f9fbe?hp=-c

Merge pull request #946 from owncloud/upgrading_account_manager

Upgrading account manager
---

d9e22f0752ceca1830a5367e9b3ff33fc65f9fbe
diff --combined src/com/owncloud/android/providers/FileContentProvider.java
index bf1891e8,b36c5b5b..8c24c03a
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@@ -745,15 -745,15 +745,15 @@@ public class FileContentProvider extend
                              + ProviderTableMeta.OCSHARES_SHARE_TYPE + " INTEGER, "
                              + ProviderTableMeta.OCSHARES_SHARE_WITH + " TEXT, "
                              + ProviderTableMeta.OCSHARES_PATH + " TEXT, "
 -                            + ProviderTableMeta.OCSHARES_PERMISSIONS+ " INTEGER, "
 +                            + ProviderTableMeta.OCSHARES_PERMISSIONS + " INTEGER, "
                              + ProviderTableMeta.OCSHARES_SHARED_DATE + " INTEGER, "
                              + ProviderTableMeta.OCSHARES_EXPIRATION_DATE + " INTEGER, "
                              + ProviderTableMeta.OCSHARES_TOKEN + " TEXT, "
                              + 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_ACCOUNT_OWNER + " TEXT );" );
 +                            + ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + " INTEGER,"
 +                            + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + " TEXT );");
  
                      upgraded = true;
                      db.setTransactionSuccessful();
@@@ -835,7 -835,6 +835,7 @@@
  
  
      private boolean updateAccountName(SQLiteDatabase db){
 +        Log_OC.d("SQL", "THREAD:  "+ Thread.currentThread().getName());
          AccountManager ama = AccountManager.get(getContext());
          boolean upgradedResult = true;
          boolean upgraded = false;
@@@ -844,7 -843,7 +844,7 @@@
  			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);
@@@ -852,17 -851,17 +852,17 @@@
                  // 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,
 +                            cv,
 +                            ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",
 +                            new String[]{ oldAccountName });
                      upgraded = true;
                      db.setTransactionSuccessful();
  
 -                    Log_OC.i("SQL", "Updated account in database: old name == " + oldAccountName +
 -                            ", new name == " + account.name);
 -
 +                     Log_OC.d("SQL", "Updated account in database: old name == " + oldAccountName +
 +                             ", new name == " + account.name + " (" + num + " rows updated )");
                  } catch (SQLException e){
                      upgraded = false;
                  } finally {