Merge pull request #2057 from aws-amplify/merge_develop_for_021701_release

Merge develop for 2.17.1 release.

Author: jamesonwilliams

.gitignore

@@ -36,15 +36,7 @@ captures/
 
 # IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
-.idea/codeStyles
-.idea/misc.xml
+.idea
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.

.idea/modules.xml

@@ -223,7 +223,9 @@ public IdentityManager(final Context context,
                            final AWSConfiguration awsConfiguration) {
         this.appContext = context.getApplicationContext();
         this.awsConfiguration = awsConfiguration;
-        this.clientConfiguration = new ClientConfiguration().withUserAgent(awsConfiguration.getUserAgent());
+        this.clientConfiguration = new ClientConfiguration()
+                .withUserAgent(awsConfiguration.getUserAgent())
+                .withUserAgentOverride(awsConfiguration.getUserAgentOverride());
         this.credentialsProviderHolder = new AWSCredentialsProviderHolder();
         createCredentialsProvider(this.appContext, this.clientConfiguration);
         this.awsKeyValueStore = new AWSKeyValueStore(appContext, SHARED_PREF_NAME, isPersistenceEnabled);
@@ -905,7 +907,6 @@ public void login(final Context context,
      */
     private void createCredentialsProvider(final Context context,
                                            final ClientConfiguration clientConfiguration) {
-
         Log.d(LOG_TAG, "Creating the Cognito Caching Credentials Provider "
                 + "with a refreshing Cognito Identity Provider.");
 
@@ -929,9 +930,16 @@ private void createCredentialsProvider(final Context context,
             new AWSRefreshingCognitoIdentityProvider(null, poolId,
                 clientConfiguration, cognitoIdentityRegion);
 
-        final CognitoCachingCredentialsProvider cognitoCachingCredentialsProvider = new CognitoCachingCredentialsProvider(context, refreshingCredentialsProvider,
-                cognitoIdentityRegion, clientConfiguration);
+        final CognitoCachingCredentialsProvider cognitoCachingCredentialsProvider =
+                new CognitoCachingCredentialsProvider(
+                        context,
+                        refreshingCredentialsProvider,
+                        cognitoIdentityRegion,
+                        clientConfiguration);
         cognitoCachingCredentialsProvider.setPersistenceEnabled(isPersistenceEnabled);
+        if (clientConfiguration.getUserAgentOverride() != null) {
+            cognitoCachingCredentialsProvider.setUserAgentOverride(clientConfiguration.getUserAgentOverride());
+        }
         credentialsProviderHolder.setUnderlyingProvider(cognitoCachingCredentialsProvider);
     }
 

.idea/runConfigurations.xml

@@ -14,7 +14,7 @@ android {
 
 dependencies {
     api project(':aws-android-sdk-auth-core')
-    api 'com.google.android.gms:play-services-auth:18.0.0'
+    api 'com.google.android.gms:play-services-auth:18.1.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
 }

.idea/vcs.xml

@@ -10,10 +10,16 @@ android {
         versionCode 1
         versionName '1.0'
     }
+
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
     api project(':aws-android-sdk-core')
     implementation 'com.amazonaws:aws-android-sdk-cognitoidentityprovider-asf:1.0.0'
-}
 
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'androidx.test:core:1.2.0'
+}

.travis.yml

@@ -189,6 +189,7 @@ public CognitoUserPool(Context context, AWSConfiguration awsConfiguration) {
 
             final ClientConfiguration clientConfig = new ClientConfiguration();
             clientConfig.setUserAgent(awsConfiguration.getUserAgent());
+            clientConfig.setUserAgentOverride(awsConfiguration.getUserAgentOverride());
             this.client = new AmazonCognitoIdentityProviderClient(new AnonymousAWSCredentials(), clientConfig);
             this.client.setRegion(com.amazonaws.regions.Region.getRegion(Regions.fromName(userPoolConfiguration.getString("Region"))));
         } catch (Exception e) {

aws-android-sdk-auth-core/src/main/java/com/amazonaws/mobile/auth/core/IdentityManager.java

@@ -24,6 +24,7 @@
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.handlers.AuthenticationHandler;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -47,17 +48,10 @@ public class AuthenticationContinuation implements CognitoIdentityProviderContin
     private final Context context;
     private final AuthenticationHandler callback;
     private final boolean runInBackground;
+    private final Map<String, String> clientMetadata;
 
     private AuthenticationDetails authenticationDetails = null;
-    private Map<String, String> clientMetadata;
 
-    /**
-     * Constructs a new continuation in the authentication process.
-     *
-     * @param user
-     * @param runInBackground
-     * @param callback
-     */
     /**
      * Constructs a new continuation in the authentication process.
      *
@@ -74,7 +68,7 @@ public AuthenticationContinuation(CognitoUser user,
         this.context = context;
         this.runInBackground = runInBackground;
         this.callback = callback;
-        this.clientMetadata = Collections.emptyMap();
+        this.clientMetadata = new HashMap<>();
     }
 
     /**
@@ -84,8 +78,9 @@ public AuthenticationContinuation(CognitoUser user,
      * </p>
      * @return ClientMetadata
      */
+    @SuppressWarnings("unused")
     public Map<String, String> getClientMetaData() {
-        return clientMetadata;
+        return Collections.unmodifiableMap(clientMetadata);
     }
 
     /**
@@ -94,14 +89,17 @@ public Map<String, String> getClientMetaData() {
      */
     public void setClientMetaData(Map<String, String> clientMetadata) {
         this.clientMetadata.clear();
-        this.clientMetadata.putAll(clientMetadata);
+        if (clientMetadata != null) {
+            this.clientMetadata.putAll(clientMetadata);
+        }
     }
 
     /**
      * Returns the parameters required for this continuation.
      *
      * @return
      */
+    @SuppressWarnings("JavaDoc")
     @Override
     public String getParameters() {
         return "AuthenticationDetails";