[MobileClient] Fix drop-in UI initialization from awsconfiguration.json (#860)

Author: minbi

CHANGELOG.md

@@ -8,6 +8,19 @@
   * AWS IoT SDK for Android now supports MQTT over TLS with X.509 client certificate authentication on port 443. Previously this combination of protocol and authentication mechanism was only supported on port 8883. `connectUsingALPN()` method allows developers to connect to AWS IoT using client certificate authentication on port 443. Please look at [this blog](https://aws.amazon.com/blogs/iot/mqtt-with-tls-client-authentication-on-port-443-why-it-is-useful-and-how-it-works/) for more details.
   * **Breaking Change:** Please note that the type of aws-android-sdk-iot artifact is being changed from a`jar` to an `aar`. Also note that the `aar` artifacts needs to be explicitly specified in the dependency as `implementation ("com.amazonaws:aws-android-sdk-iot:2.12.+@aar") { transitive =true }` on some of the older versions of gradle.
 
+### Bug Fixes
+
+* **AWS Mobile Client**
+  * Fixed a bug when initializing drop-in UI that caused the Facebook, Google, or Userpools provider to not be instantiated.
+
+### Misc. Updates
+
+* Model updates for the following services
+  * AWS IoT
+  * Amazon Transcribe
+
+## [Release 2.12.7](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.12.7)
+
 ### Enhancements
 
 * **AWS Mobile Client**

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

@@ -481,7 +481,7 @@ public void run() {
                     identityManager.setConfiguration(awsConfiguration);
                     identityManager.setPersistenceEnabled(mIsPersistenceEnabled);
                     IdentityManager.setDefaultIdentityManager(identityManager);
-                    registerConfigSignInProviders();
+                    registerConfigSignInProviders(awsConfiguration);
                     identityManager.addSignInStateChangeListener(new SignInStateChangeListener() {
                         @Override
                         public void onUserSignedIn() {
@@ -565,7 +565,7 @@ public void onUserSignedOut() {
                         }
                     }
 
-                    JSONObject hostedUIJSON = getHostedUIJSON();
+                    JSONObject hostedUIJSON = getHostedUIJSON(awsConfiguration);
                     if (hostedUIJSON != null) {
                         try {
                             // Pre-warm the Custom Tabs based on
@@ -617,10 +617,9 @@ public void onFailure(Exception e) {
                         return;
                     }
 
-                    final UserStateDetails userStateDetails = getUserStateDetails(true);
-
                     AWSMobileClient.this.awsConfiguration = awsConfiguration;
 
+                    final UserStateDetails userStateDetails = getUserStateDetails(true);
                     callback.onResult(userStateDetails);
                     setUserState(userStateDetails);
                 }
@@ -629,6 +628,10 @@ public void onFailure(Exception e) {
     }
 
     JSONObject getHostedUIJSONFromJSON() {
+        return getHostedUIJSONFromJSON(this.awsConfiguration);
+    }
+
+    JSONObject getHostedUIJSONFromJSON(final AWSConfiguration awsConfig) {
         final JSONObject mobileClientJSON = awsConfiguration.optJsonObject("Auth");
         if (mobileClientJSON != null && mobileClientJSON.has("OAuth")) {
             try {
@@ -643,8 +646,12 @@ JSONObject getHostedUIJSONFromJSON() {
     }
 
     JSONObject getHostedUIJSON() {
+        return getHostedUIJSON(this.awsConfiguration);
+    }
+
+    JSONObject getHostedUIJSON(final AWSConfiguration awsConfig) {
         try {
-            JSONObject hostedUIJSONFromJSON = getHostedUIJSONFromJSON();
+            JSONObject hostedUIJSONFromJSON = getHostedUIJSONFromJSON(awsConfig);
             if (hostedUIJSONFromJSON == null) {
                 return null;
             }
@@ -3147,18 +3154,26 @@ private void registerUserSignInProvidersWithPermissions() {
      * AWSConfiguration.
      */
     private void registerConfigSignInProviders() {
+        registerConfigSignInProviders(this.awsConfiguration);
+    }
+
+    /**
+     * Register the SignInProvider and permissions based on the
+     * AWSConfiguration.
+     */
+    private void registerConfigSignInProviders(final AWSConfiguration awsConfig) {
         Log.d(TAG, "Using the SignInProviderConfig from `awsconfiguration.json`.");
         final IdentityManager identityManager = IdentityManager.getDefaultIdentityManager();
 
-        if (isConfigurationKeyPresent(USER_POOLS)) {
+        if (isConfigurationKeyPresent(USER_POOLS, awsConfig)) {
             identityManager.addSignInProvider(CognitoUserPoolsSignInProvider.class);
         }
 
-        if (isConfigurationKeyPresent(FACEBOOK)) {
+        if (isConfigurationKeyPresent(FACEBOOK, awsConfig)) {
             identityManager.addSignInProvider(FacebookSignInProvider.class);
         }
 
-        if (isConfigurationKeyPresent(GOOGLE)) {
+        if (isConfigurationKeyPresent(GOOGLE, awsConfig)) {
             identityManager.addSignInProvider(GoogleSignInProvider.class);
         }
     }
@@ -3169,8 +3184,17 @@ private void registerConfigSignInProviders() {
      * @param configurationKey The key for SignIn in AWSConfiguration
      */
     private boolean isConfigurationKeyPresent(final String configurationKey) {
+        return isConfigurationKeyPresent(configurationKey, this.awsConfiguration);
+    }
+
+    /**
+     * Check if the AWSConfiguration has the specified key.
+     *
+     * @param configurationKey The key for SignIn in AWSConfiguration
+     */
+    private boolean isConfigurationKeyPresent(final String configurationKey, final AWSConfiguration awsConfig) {
         try {
-            JSONObject jsonObject = this.awsConfiguration.optJsonObject(configurationKey);
+            JSONObject jsonObject = awsConfig.optJsonObject(configurationKey);
             if (configurationKey.equals(GOOGLE)) {
                 return jsonObject != null && jsonObject.getString(GOOGLE_WEBAPP_CONFIG_KEY) != null;
             } else {