Merge pull request #2450 from brandonpage/login-server-refresh

Rollback change to use instance url for token refresh.

Author: brandonpage

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

@@ -653,14 +653,15 @@ private Bundle refreshStaleToken(Account account) throws NetworkErrorException {
             final AccountManager mgr = AccountManager.get(context);
             final String encryptionKey = SalesforceSDKManager.getEncryptionKey();
             final String refreshToken = SalesforceSDKManager.decrypt(mgr.getPassword(account), encryptionKey);
+            final String loginServer = SalesforceSDKManager.decrypt(mgr.getUserData(account,
+                    AuthenticatorService.KEY_LOGIN_URL), encryptionKey);
             final String clientId = SalesforceSDKManager.decrypt(mgr.getUserData(account,
                     AuthenticatorService.KEY_CLIENT_ID), encryptionKey);
             final String instServer = SalesforceSDKManager.decrypt(mgr.getUserData(account,
                     AuthenticatorService.KEY_INSTANCE_URL), encryptionKey);
             final String communityUrl = SalesforceSDKManager.decrypt(mgr.getUserData(account,
                     AuthenticatorService.KEY_COMMUNITY_URL), encryptionKey);
 
-            final String url = (communityUrl != null) ? communityUrl : instServer;
             final List<String> additionalOauthKeys = SalesforceSDKManager.getInstance().getAdditionalOauthKeys();
             Map<String, String> values = null;
             if (additionalOauthKeys != null && !additionalOauthKeys.isEmpty()) {
@@ -676,11 +677,15 @@ private Bundle refreshStaleToken(Account account) throws NetworkErrorException {
             final Map<String,String> addlParamsMap = SalesforceSDKManager.getInstance().getLoginOptions().getAdditionalParameters();
             try {
                 final OAuth2.TokenEndpointResponse tr = OAuth2.refreshAuthToken(HttpAccess.DEFAULT,
-                        new URI(url), clientId, refreshToken, addlParamsMap);
+                        new URI(loginServer), clientId, refreshToken, addlParamsMap);
                 if (!instServer.equalsIgnoreCase(tr.instanceUrl)) {
                     mgr.setUserData(account, AuthenticatorService.KEY_INSTANCE_URL,
                             SalesforceSDKManager.encrypt(tr.instanceUrl, encryptionKey));
                 }
+                if (communityUrl != null && !communityUrl.equalsIgnoreCase(tr.communityUrl)) {
+                    mgr.setUserData(account, AuthenticatorService.KEY_COMMUNITY_URL,
+                            SalesforceSDKManager.encrypt(tr.communityUrl, encryptionKey));
+                }
                 mgr.setUserData(account, AuthenticatorService.KEY_LIGHTNING_DOMAIN,
                             SalesforceSDKManager.encrypt(tr.lightningDomain, encryptionKey));
                 mgr.setUserData(account, AuthenticatorService.KEY_LIGHTNING_SID,