Merge pull request #2483 from wmathurin/dev

Using resources by version call to rehydrate session

Author: wmathurin

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/ui/SalesforceDroidGapActivity.java

@@ -350,7 +350,7 @@ public void authenticatedRestClient(RestClient client) {
                      * but a stale session ID will cause the WebView to redirect
                      * to the web login.
                      */
-                    SalesforceDroidGapActivity.this.client.sendAsync(RestRequest.getRequestForLimits(ApiVersionStrings.VERSION_NUMBER), new AsyncRequestCallback() {
+                    SalesforceDroidGapActivity.this.client.sendAsync(RestRequest.getCheapRequest(ApiVersionStrings.VERSION_NUMBER), new AsyncRequestCallback() {
 
                         @Override
                         public void onSuccess(RestRequest request, RestResponse response) {
@@ -423,7 +423,7 @@ public void authenticatedRestClient(RestClient client) {
             });
             return;
         }
-        client.sendAsync(RestRequest.getRequestForLimits(ApiVersionStrings.VERSION_NUMBER), new AsyncRequestCallback() {
+        client.sendAsync(RestRequest.getCheapRequest(ApiVersionStrings.VERSION_NUMBER), new AsyncRequestCallback() {
 
             @Override
             public void onSuccess(RestRequest request, RestResponse response) {

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/idp/IDPAuthCodeHelper.kt

@@ -120,7 +120,7 @@ internal class IDPAuthCodeHelper private constructor(
         SalesforceSDKLogger.d(TAG, "Obtaining valid access token")
         buildRestClient()?.let {restClient ->
             val restResponse = try {
-                restClient.sendSync(RestRequest.getRequestForLimits(ApiVersionStrings.VERSION_NUMBER))
+                restClient.sendSync(RestRequest.getCheapRequest(ApiVersionStrings.VERSION_NUMBER))
             } catch (e: IOException) {
                 SalesforceSDKLogger.e(TAG, "Failed to obtain valid access token", e)
                 null

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

@@ -957,6 +957,15 @@ public static RestRequest getRequestForLimits(String apiVersion) {
 		return new RestRequest(RestMethod.GET, path.toString());
 	}
 
+	/**
+	 * Cheap request to re-hydrate access token
+	 * @param apiVersion
+	 * @return a rest request
+	 */
+	public static RestRequest getCheapRequest(String apiVersion) {
+		return getRequestForResources(apiVersion);
+	}
+
     /**
      * Helper method for creating conditional HTTP header.
      *