Merge pull request #2100 from bhariharan/master

Add missing upgrade key

Author: bhariharan

libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ClientManager.java

@@ -261,6 +261,8 @@ public static synchronized void upgradeTo8Dot2() {
                 accountManager.setUserData(account, AuthenticatorService.KEY_LOGIN_URL, Encryptor.encrypt(loginServer, newEncryptionKey));
                 final String idUrl = Encryptor.legacyDecrypt(accountManager.getUserData(account, AuthenticatorService.KEY_ID_URL), legacyEncryptionKey);
                 accountManager.setUserData(account, AuthenticatorService.KEY_ID_URL, Encryptor.encrypt(idUrl, newEncryptionKey));
+                final String clientId = Encryptor.legacyDecrypt(accountManager.getUserData(account, AuthenticatorService.KEY_CLIENT_ID), legacyEncryptionKey);
+                accountManager.setUserData(account, AuthenticatorService.KEY_CLIENT_ID, Encryptor.encrypt(clientId, newEncryptionKey));
                 final String instanceServer = Encryptor.legacyDecrypt(accountManager.getUserData(account, AuthenticatorService.KEY_INSTANCE_URL), legacyEncryptionKey);
                 accountManager.setUserData(account, AuthenticatorService.KEY_INSTANCE_URL, Encryptor.encrypt(instanceServer, newEncryptionKey));
                 final String orgId = Encryptor.legacyDecrypt(accountManager.getUserData(account, AuthenticatorService.KEY_ORG_ID), legacyEncryptionKey);