feat(W-19758940): bind ClientManager to persisted user

Author: brandonpage

libs/MobileSync/src/com/salesforce/androidsdk/mobilesync/manager/SyncManager.kt

@@ -46,6 +46,7 @@ import com.salesforce.androidsdk.mobilesync.util.SyncState.Status.STOPPED
 import com.salesforce.androidsdk.mobilesync.util.SyncState.Type.syncDown
 import com.salesforce.androidsdk.mobilesync.util.SyncState.Type.syncUp
 import com.salesforce.androidsdk.rest.ApiVersionStrings
+import com.salesforce.androidsdk.rest.ClientManager
 import com.salesforce.androidsdk.rest.RestClient
 import com.salesforce.androidsdk.rest.RestRequest
 import com.salesforce.androidsdk.rest.RestResponse
@@ -826,9 +827,10 @@ class SyncManager private constructor(smartStore: SmartStore, restClient: RestCl
                  * RestClient should be set to the unauthenticated RestClient instance.
                  */
                 val restClient: RestClient? = if (user == null) {
-                    SalesforceSDKManager.getInstance().clientManager.peekUnauthenticatedRestClient()
+                    SalesforceSDKManager.getInstance().getUnauthenticatedRestClient()
                 } else {
-                    SalesforceSDKManager.getInstance().clientManager.peekRestClient(user)
+                    ClientManager(SalesforceSDKManager.getInstance().appContext, user)
+                        .peekRestClient()
                 }
                 instance = SyncManager(store, restClient)
                 instance.also { INSTANCES[uniqueId] = it }
@@ -874,4 +876,4 @@ class SyncManager private constructor(smartStore: SmartStore, restClient: RestCl
             }
         }
     }
-}
+}

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/plugin/SFAccountManagerPlugin.java

@@ -29,6 +29,7 @@
 import android.content.Intent;
 
 import com.salesforce.androidsdk.accounts.UserAccount;
+import com.salesforce.androidsdk.accounts.UserAccountManager;
 import com.salesforce.androidsdk.app.SalesforceSDKManager;
 import com.salesforce.androidsdk.phonegap.util.SalesforceHybridLogger;
 
@@ -133,7 +134,13 @@ protected void logout(JSONArray args, CallbackContext callbackContext) {
         		account = new UserAccount(user);
         	}
         }
-        SalesforceSDKManager.getInstance().getUserAccountManager().signoutUser(account, cordova.getActivity());
+        final UserAccountManager userAccountManager =
+                SalesforceSDKManager.getInstance().getUserAccountManager();
+        if (account == null) {
+            userAccountManager.signoutCurrentUser(cordova.getActivity());
+        } else {
+            userAccountManager.signoutUser(account, cordova.getActivity());
+        }
         callbackContext.success();
     }
 

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/plugin/SalesforceNetworkPlugin.java

@@ -29,6 +29,7 @@
 import android.text.TextUtils;
 import android.util.Base64;
 
+import com.salesforce.androidsdk.app.SalesforceSDKManager;
 import com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity;
 import com.salesforce.androidsdk.phonegap.util.SalesforceHybridLogger;
 import com.salesforce.androidsdk.rest.RestClient;
@@ -270,7 +271,7 @@ private RestClient getRestClient(boolean doesNotRequireAuth) {
             return null;
         }
         if (doesNotRequireAuth) {
-            return currentActivity.buildClientManager().peekUnauthenticatedRestClient();
+            return SalesforceSDKManager.getInstance().getUnauthenticatedRestClient();
         }
         return currentActivity.getRestClient();
     }