fix(AWSMobileClient): getTokens latency fix (#2075)

Author: TrekSoft

aws-android-sdk-core/src/main/java/com/amazonaws/internal/keyvaluestore/AWSKeyValueStore.java

@@ -180,7 +180,11 @@ public synchronized void setPersistenceEnabled(boolean isPersistenceEnabled) {
      */
     public synchronized boolean contains(final String dataKey) {
         if (isPersistenceEnabled) {
-            return sharedPreferencesForData.contains(getDataKeyUsedInPersistentStore(dataKey));
+            if (cache.containsKey(dataKey)) {
+                return true;
+            } else {
+                return sharedPreferencesForData.contains(getDataKeyUsedInPersistentStore(dataKey));
+            }
         } else {
             return cache.containsKey(dataKey);
         }
@@ -201,7 +205,7 @@ public synchronized String get(final String dataKey) {
             return null;
         }
 
-        if (!isPersistenceEnabled) {
+        if (cache.containsKey(dataKey) || !isPersistenceEnabled) {
             return cache.get(dataKey);
         }
 

aws-android-sdk-mobile-client/src/main/java/com/amazonaws/mobile/client/AWSMobileClient.java

@@ -1762,7 +1762,7 @@ protected void federateWithCognitoIdentity(final String providerKey,
     @WorkerThread
     public Tokens getTokens() throws Exception {
         final InternalCallback<Tokens> internalCallback = new InternalCallback<Tokens>();
-        return internalCallback.await(_getTokens(internalCallback, true));
+        return internalCallback.await(_getTokens(internalCallback, false));
     }
 
     /**
@@ -1775,7 +1775,7 @@ public Tokens getTokens() throws Exception {
     @AnyThread
     public void getTokens(final Callback<Tokens> callback) {
         final InternalCallback<Tokens> internalCallback = new InternalCallback<Tokens>(callback);
-        internalCallback.async(_getTokens(internalCallback, true));
+        internalCallback.async(_getTokens(internalCallback, false));
     }
 
     protected Tokens getTokens(boolean waitForSignIn) throws Exception {