AWS SDK for Android 2.6.7

Author: AWS

.gitignore

@@ -1,5 +1,31 @@
 # Change Log - AWS SDK for Android
 
+## [Release 2.6.7](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.6.7)
+
+### New Features
+
+- **AWS MobileClient**
+  - Added `AWSMobileClient` to initialize the SDK and create instances of other SDK clients. Currently support is limited to `SignInUI`. AWSMobileClient creates the `AWSConfiguration` based on `awsconfiguration.json`, fetches the Cognito Identity and registers the SignIn providers with the permissions based on the  `AWSConfiguration`.
+
+### Enhancements
+
+- **Amazon Polly**
+  - Added support for new voices - `Aditi` and `Seoyeon`.
+  - Added support for new language code - `ko-KR`.
+
+- **Amazon Pinpoint**
+  - Added support for notification channel on Android SDK 26 (Oreo).
+  - On Android SDK 23 (Marshmallow) and newer devices, the large icon is not set if it is not present from the push payload and a small icon is set in the push payload. This allows setting only the small icon from the campaign in the Pinpoint console.
+  - On Android SDK 23 and newer devices, if the small icon is set in a format that is an opaque color image, it is now converted to greyscale to prevent displaying a grey box. Small icons in the correct format of opaque white with a transparent background will still render appropriately.
+
+### Bug Fixes:
+
+- **General**
+  - Fixed domain returned for `cn-north-1` region and region parsing for `amazonaws.com.cn` domains. See [pr #362](https://github.com/aws/aws-sdk-android/pull/362).
+
+- **AWS IoT**
+  - Increased default time to keep alive to 300 seconds.
+
 ## [Release 2.6.6](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.6.6)
 
 ### Bug Fixes:

CHANGELOG.md

@@ -278,4 +278,4 @@ If you are using a Mac, you may run into issues when trying to compile, because
 
 ## To learn more about Android Development
 
-For more information on Android development, see the Android developer site at: [developer.android.com](http://developer.android.com/index.html)
+For more information on Android development, see the Android developer site at: [developer.android.com](http://developer.android.com/index.html)

README.md

@@ -12,15 +12,15 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.6.6</version>
+    <version>2.6.7</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.6.6</version>
+      <version>2.6.7</version>
     </dependency>
   </dependencies>
 

aws-android-sdk-apigateway-core/pom.xml

@@ -21,15 +21,15 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.6.6</version>
+    <version>2.6.7</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.6.6</version>
+      <version>2.6.7</version>
     </dependency>
 
     <dependency>

aws-android-sdk-auth-core/pom.xml

@@ -27,7 +27,7 @@
 
 /**
  * A default base class easing the work required for implementing the SignInResultHandler for
- * {@link IdentityManager#setUpToAuthenticate(Context, SignInResultHandler)} by providing default
+ * {@link IdentityManager#login(Context, SignInResultHandler)} by providing default
  * behavior in the case that the user cancels signing in or encounters an error. The default for
  * canceling is to toast that sign-in was canceled. The default for a sign-in error is to show
  * an alert dialog specifying the error message.

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

@@ -1,5 +1,5 @@
 /*
-  * Copyright 2013-2017 Amazon.com, Inc. or its affiliates.
+  * Copyright 2017-2017 Amazon.com, Inc. or its affiliates.
   * All Rights Reserved.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,8 +25,6 @@
 import com.amazonaws.ClientConfiguration;
 import com.amazonaws.SDKGlobalConfiguration;
 
-import com.amazonaws.mobile.config.AWSConfiguration;
-
 import com.amazonaws.auth.AWSBasicCognitoIdentityProvider;
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
@@ -39,11 +37,14 @@
 import com.amazonaws.mobile.auth.core.signin.SignInProvider;
 import com.amazonaws.mobile.auth.core.signin.SignInProviderResultHandler;
 import com.amazonaws.mobile.auth.core.internal.util.ThreadUtils;
+import com.amazonaws.mobile.config.AWSConfiguration;
 
 import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -55,6 +56,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.json.JSONArray;
+
 /**
  * The identity manager keeps track of the current sign-in provider and is responsible
  * for caching credentials.
@@ -169,6 +172,16 @@ public String refresh() {
         }
     }
 
+    /**
+     * @param context the application context.
+     */
+    public IdentityManager(final Context context) {
+        this.appContext = context.getApplicationContext();
+        this.awsConfiguration = null;
+        this.clientConfiguration = null;
+        this.credentialsProviderHolder = null;
+    }
+
     /**
      * Constructor. 
      * Initializes with the application context and the AWSConfiguration passed in.
@@ -253,14 +266,22 @@ public static void setDefaultIdentityManager(IdentityManager identityManager) {
     }
 
     /**
-     * Retrieve the AWSConfiguration object
+     * Retrieve the AWSConfiguration object that represents the `awsconfiguration.json`.
      *
      * @return AWSConfiguration Return the reference to the AWSConfiguration object
      */
     public AWSConfiguration getConfiguration() {
         return this.awsConfiguration;
     }
 
+    /**
+     * Set the AWSConfiguration.
+     * @param configuration
+     */
+    public void setConfiguration(AWSConfiguration configuration) {
+        this.awsConfiguration = configuration;
+    }
+
     /**
      * Check if the credentials are expired.
      *
@@ -589,26 +610,8 @@ public void run() {
     private void handleUnauthenticated(final Activity callingActivity,
                                        final StartupAuthResultHandler startupAuthResultHandler,
                                        final AuthException ex) {
-        // Optional Sign-in can dispose the sign-in manager right away here, while mandatory sign-in, needs
-        // it to stay around a bit longer, since it will be required to call sign-in or sign-up.
-
         SignInManager.dispose();
 
-        if (getCachedUserID() != null) {
-            handleStartupAuthResult(callingActivity, startupAuthResultHandler, ex, null);
-        }
-
-        getUserID(new IdentityHandler() {
-            @Override
-            public void onIdentityId(final String identityId) {
-                handleStartupAuthResult(callingActivity, startupAuthResultHandler, ex, null);
-            }
-
-            @Override
-            public void handleError(final Exception exception) {
-                handleStartupAuthResult(callingActivity, startupAuthResultHandler, ex, exception);
-            }
-        });
         handleStartupAuthResult(callingActivity, startupAuthResultHandler, ex, null);
     }
 
@@ -643,10 +646,12 @@ public void run() {
      * @param startupAuthResultHandler a handler for returning results.
      * @param minimumDelay the minimum delay to wait before returning the sign-in result.
      */
-    public void doStartupAuth(final Activity callingActivity,
+    public void resumeSession(final Activity callingActivity,
                               final StartupAuthResultHandler startupAuthResultHandler,
                               final long minimumDelay) {
 
+        Log.d(LOG_TAG, "Resume session called.");
+
         executorService.submit(new Runnable() {
             public void run() {
                 Log.d(LOG_TAG, "Starting up authentication...");
@@ -732,9 +737,44 @@ public void onError(final IdentityProvider provider, final Exception ex) {
      * @param callingActivity the calling activity.
      * @param startupAuthResultHandler a handler for returning results.
      */
-    public void doStartupAuth(final Activity callingActivity,
+    public void resumeSession(final Activity callingActivity,
+                              final StartupAuthResultHandler startupAuthResultHandler) {
+        resumeSession(callingActivity, startupAuthResultHandler, 0);
+    }
+
+    /**
+     * This should be called from your app's splash activity upon start-up. If the user was previously
+     * signed in, this will attempt to refresh their identity using the previously sign-ed in provider.
+     * If the user was not previously signed in or their identity could not be refreshed with the
+     * previously signed in provider and sign-in is optional, it will attempt to obtain an unauthenticated (guest)
+     * identity.
+     *
+     * @param callingActivity the calling activity.
+     * @param startupAuthResultHandler a handler for returning results.
+     * @deprecated Please use {@link #resumeSession(Activity, StartupAuthResultHandler)} method instead.
+     */
+    @Deprecated
+    public void doStartUpAuth(final Activity callingActivity,
                               final StartupAuthResultHandler startupAuthResultHandler) {
-        doStartupAuth(callingActivity, startupAuthResultHandler, 0);
+        resumeSession(callingActivity, startupAuthResultHandler, 0);
+    }
+
+    /**
+     * This should be called from your app's splash activity upon start-up. If the user was previously
+     * signed in, this will attempt to refresh their identity using the previously sign-ed in provider.
+     * If the user was not previously signed in or their identity could not be refreshed with the
+     * previously signed in provider and sign-in is optional, it will attempt to obtain an unauthenticated (guest)
+     * identity.
+     *
+     * @param callingActivity the calling activity.
+     * @param startupAuthResultHandler a handler for returning results.
+     * @deprecated Please use {@link #resumeSession(Activity, StartupAuthResultHandler, long)} method instead.
+     */
+    @Deprecated
+    public void doStartUpAuth(final Activity callingActivity,
+                              final StartupAuthResultHandler startupAuthResultHandler,
+                              final long minimumDelay) {
+        resumeSession(callingActivity, startupAuthResultHandler, minimumDelay);
     }
 
     /**
@@ -751,13 +791,34 @@ public void expireSignInTimeout() {
      *
      * @param context context.
      * @param signInResultHandler the results handler.
+     * @deprecated Please use {@link #login(Context, SignInResultHandler)} method instead.
      */
+    @Deprecated
     public void setUpToAuthenticate(final Context context,
                                     final SignInResultHandler signInResultHandler) {
-        // Start the sign-in activity. We do not finish the calling activity allowing the user to navigate back.
-        final SignInManager signInManager = SignInManager.getInstance(
-            context.getApplicationContext());
-        signInManager.setResultHandler(signInResultHandler);
+        this.login(context, signInResultHandler);
+    }
+
+    /**
+     * Call login to initiate sign-in with a provider.
+     *
+     * Note: This should not be called when already signed in with a provider.
+     *
+     * @param context context.
+     * @param signInResultHandler the results handler.
+     */
+    public void login(final Context context,
+                      final SignInResultHandler signInResultHandler) {
+        // Start the sign-in activity. 
+        // We do not finish the calling activity allowing the user to navigate back.
+        try {
+            SignInManager
+                .getInstance(context.getApplicationContext())
+                .setResultHandler(signInResultHandler);
+        } catch (final Exception exception) {
+            Log.e(LOG_TAG, "Error in instantiating SignInManager. " +
+                           "Check the context and completion handler.", exception);
+        }
     }
 
     private void setCredentialsProvider(final Context context,

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

@@ -18,14 +18,15 @@
 package com.amazonaws.mobile.auth.core;
 
 /**
- * The result for IdentityManager's doStartupAuth().
+ * Callback function result for calling 
+ * {@link IdentityManager#resumeSession(Activity, StartupAuthResultHandler, long)}.
  */
 public class StartupAuthResult {
     private final IdentityManager identityManager;
     private final StartupAuthErrorDetails errors;
 
     public StartupAuthResult(final IdentityManager identityManager,
-                                    final StartupAuthErrorDetails startupAuthErrorDetails) {
+                             final StartupAuthErrorDetails startupAuthErrorDetails) {
         this.identityManager = identityManager;
         this.errors = startupAuthErrorDetails;
     }
@@ -41,13 +42,13 @@ public boolean isUserSignedIn() {
      * @return true if an unauthenticated (guest) identity was obtained, otherwise false.
      */
     public boolean isUserAnonymous() {
-        return didObtainIdentity() && !isUserSignedIn();
+        return isIdentityIdAvailable() && !isUserSignedIn();
     }
 
     /**
      * @return true if an identity was obtained, either unauthenticated (guest) or authenticated with a provider.
      */
-    private boolean didObtainIdentity() {
+    public boolean isIdentityIdAvailable() {
         return identityManager.getCachedUserID() != null;
     }
 

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

@@ -18,7 +18,8 @@
 package com.amazonaws.mobile.auth.core;
 
 /**
- * Interface for calling IdentityManager's doStartupAuth().
+ * Callback function for calling 
+ * {@link IdentityManager#resumeSession(Activity, StartupAuthResultHandler, long)}.
  */
 public interface StartupAuthResultHandler {
     /**