[skip test][CognitoAuth] Add tests for no scopes cache; fix diamond operator (#879) [bump version 2.13.1]

Author: minbi

aws-android-sdk-cognitoauth/src/androidTest/java/com/amazonaws/mobileconnectors/cognitoauth/LocalDataManagerIntegrationTest.java

@@ -214,7 +214,52 @@ public void onFailure(Exception e) {
                     setFromString("email,profile,openid"));
 
             printSharedPreferencesKeys();
-            verifySharedPreferencesForCachedState(auth.awsKeyValueStore);
+            verifySharedPreferencesForCachedState(auth.awsKeyValueStore, "proofKey", "email,profile,openid");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            assertTrue("Error occurred" + ex, false);
+        }
+    }
+
+    @Test
+    public void testCognitoAuthCachedStateForNoScopes() {
+        printSharedPreferencesKeys();
+
+        try {
+            Auth.Builder builder = new Auth.Builder();
+            Auth auth = builder.setAppClientId(getPackageConfigure().getString("AppClientId"))
+                    .setAppCognitoWebDomain(getPackageConfigure().getString("WebDomain"))
+                    .setSignInRedirect(getPackageConfigure().getString("SignInRedirectURI"))
+                    .setSignOutRedirect(getPackageConfigure().getString("SignOutRedirectURI"))
+                    .setApplicationContext(InstrumentationRegistry.getTargetContext())
+                    .setAdvancedSecurityDataCollection(true)
+                    .setScopes(new HashSet<String>())
+                    .setAuthHandler(new AuthHandler() {
+                        @Override
+                        public void onSuccess(AuthUserSession session) {
+
+                        }
+
+                        @Override
+                        public void onSignout() {
+
+                        }
+
+                        @Override
+                        public void onFailure(Exception e) {
+
+                        }
+                    })
+                    .build();
+            assertNotNull(auth);
+
+            LocalDataManager.cacheState(auth.awsKeyValueStore, InstrumentationRegistry.getTargetContext(),
+                    "key",
+                    "proofKey",
+                    new HashSet<String>());
+
+            printSharedPreferencesKeys();
+            verifySharedPreferencesForCachedState(auth.awsKeyValueStore, "proofKey", null);
         } catch (Exception ex) {
             ex.printStackTrace();
             assertTrue("Error occurred" + ex, false);
@@ -358,13 +403,13 @@ private void verifySharedPreferencesForCachedSession() {
         assertNotNull(sharedPreferencesForAuth.getString(lastAuthUserKey, null));
     }
 
-    private void verifySharedPreferencesForCachedState(AWSKeyValueStore awsKeyValueStore) {
+    private void verifySharedPreferencesForCachedState(AWSKeyValueStore awsKeyValueStore, String proofKeyValue, String scopesValue) {
         assert sharedPreferencesForAuth.getAll().keySet().size() > 0;
         assert sharedPreferencesForAuthEncryptionMaterials.getAll().keySet().size() > 0;
 
-        assertEquals("proofKey",
+        assertEquals(proofKeyValue,
                 LocalDataManager.getCachedProofKey(awsKeyValueStore, InstrumentationRegistry.getTargetContext(), "key"));
-        assertEquals(setFromString("email,profile,openid"),
+        assertEquals(scopesValue == null ? new HashSet<String>() : setFromString(scopesValue),
                 LocalDataManager.getCachedScopes(awsKeyValueStore, InstrumentationRegistry.getTargetContext(), "key"));
     }
 

aws-android-sdk-cognitoauth/src/main/java/com/amazonaws/mobileconnectors/cognitoauth/AuthClient.java

@@ -618,7 +618,7 @@ public void onServiceDisconnected(final ComponentName name) {
         public void onNavigationEvent(final int navigationEvent, final Bundle extras) {
             super.onNavigationEvent(navigationEvent, extras);
             if (navigationEvent == ClientConstants.CHROME_NAVIGATION_CANCELLED) {
-                Log.i("AuthClient", "customTab hidden callback");
+                Log.i("AuthClient", "customTab hidden callback, code has already been received: " + receivedCodeTabShouldBeHidden);
                 if (!receivedCodeTabShouldBeHidden) {
                     userHandler.onFailure(new AuthNavigationException("user cancelled"));
                     receivedCodeTabShouldBeHidden = false;

aws-android-sdk-cognitoauth/src/main/java/com/amazonaws/mobileconnectors/cognitoauth/util/LocalDataManager.java

@@ -505,7 +505,7 @@ static String setToString(Set<String> stringSet) {
     }
 
     static Set<String> setFromString(String str) {
-        final HashSet<String> stringSet = new HashSet<>();
+        final HashSet<String> stringSet = new HashSet<String>();
         if (StringUtils.isBlank(str)) {
             return stringSet;
         }