Merge branch 'master' into inbox

# Conflicts:
#	README.md

Author: vbabenkoru

CHANGELOG.md

@@ -15,6 +15,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 #### Fixed
 - nothing yet
 
+## [3.1.4](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.1.4)
+#### Added
+- Push notifications now also display image thumbnails when collapsed
+
+#### Changed
+- Connection timeout for GET requests is now 3 seconds, to match other request timeouts
+- `Api-Key` header is now also used for GET requests
+
+#### Fixed
+- Fixed possible exceptions when an in-app message is not on the screen when it's being resized
+
 ## [3.1.3](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.1.3)
 #### Fixed
 - Fixed a NullPointerException that could occur in some cases when trying to get Advertising ID

README.md

@@ -121,8 +121,13 @@ Note that `FirebaseInstanceIdService` is deprecated and replaced with `onNewToke
     > ⚠ Don't specify both email and userId in the same session, as they will be treated as different users by the SDK. Only use one type of identifier, email or userId, to identify the user.
 
 3. Register for remote notifications
-
-    On application launch (or whenever you want to register the token), call `registerForPush`:
+    
+    Iterable SDK automatically registers the push token with Iterable whenever `setEmail` or `setUserId` is called.
+    > ⚠ This default behavior is the preferred way of handling token registrations.
+    
+    If you want to trigger token registration manually, first disable automatic registration by calling `setAutoPushRegistration(false)` on `IterableConfig.Builder` when initializing the SDK.
+    
+    Than call `registerForPush` whenever you want to register the token:
 
     ```
     IterableApi.getInstance().registerForPush();

iterableapi/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
 
-        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.1.3\""
+        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.1.4\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -71,7 +71,7 @@ ext {
     siteUrl = 'https://github.com/Iterable/iterable-android-sdk'
     gitUrl = 'https://github.com/Iterable/iterable-android-sdk.git'
 
-    libraryVersion = '3.1.3'
+    libraryVersion = '3.1.4'
 
     developerId = 'davidtruong'
     developerName = 'David Truong'

iterableapi/src/main/java/com/iterable/iterableapi/IterableInAppHTMLNotification.java

@@ -30,6 +30,7 @@ public class IterableInAppHTMLNotification extends Dialog {
 
     static final String BACK_BUTTON = "itbl://backButton";
     static final String JAVASCRIPT_INTERFACE = "ITBL";
+    private static final String TAG = "IterableInAppHTMLNotification";
 
     static IterableInAppHTMLNotification notification;
 
@@ -189,54 +190,58 @@ public void resize(final float height) {
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                // Since this is run asynchronously, notification might've been dismissed already
-                if (notification == null || notification.getWindow() == null) {
-                    return;
-                }
+                try {
+                    // Since this is run asynchronously, notification might've been dismissed already
+                    if (notification == null || notification.getWindow() == null || !notification.isShowing()) {
+                        return;
+                    }
 
-                DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics();
-                Window window = notification.getWindow();
-                Rect insetPadding = notification.insetPadding;
+                    DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics();
+                    Window window = notification.getWindow();
+                    Rect insetPadding = notification.insetPadding;
 
-                WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-                Display display = wm.getDefaultDisplay();
-                Point size = new Point();
+                    WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+                    Display display = wm.getDefaultDisplay();
+                    Point size = new Point();
 
-                // Get the correct screen size based on api level
-                // https://stackoverflow.com/questions/35780980/getting-the-actual-screen-height-android
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                    display.getRealSize(size);
-                } else {
-                    display.getSize(size);
-                }
-                int webViewWidth = size.x;
-                int webViewHeight = size.y;
-
-                //Check if the dialog is full screen
-                if (insetPadding.bottom == 0 && insetPadding.top == 0) {
-                    //Handle full screen
-                    window.setLayout(webViewWidth, webViewHeight);
-
-                    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                } else {
-                    // Calculates the dialog size
-                    double notificationWidth = 100-(insetPadding.left +insetPadding.right);
-                    float widthPercentage = (float) notificationWidth/100;
-                    int maxHeight = Math.min((int) (height * displayMetrics.scaledDensity), webViewHeight);
-                    int maxWidth = Math.min(webViewWidth, (int) (webViewWidth * widthPercentage));
-                    window.setLayout(maxWidth, maxHeight);
-
-                    //Calculates the horizontal position based on the dialog size
-                    double center = (insetPadding.left + notificationWidth/2f);
-                    int offset = (int) ((center - 50)/100f * webViewWidth);
-
-                    //Set the window properties
-                    WindowManager.LayoutParams wlp = window.getAttributes();
-                    wlp.x = offset;
-                    wlp.gravity = getVerticalLocation(insetPadding);
-                    wlp.dimAmount = (float) notification.backgroundAlpha;
-                    wlp.flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND;
-                    window.setAttributes(wlp);
+                    // Get the correct screen size based on api level
+                    // https://stackoverflow.com/questions/35780980/getting-the-actual-screen-height-android
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                        display.getRealSize(size);
+                    } else {
+                        display.getSize(size);
+                    }
+                    int webViewWidth = size.x;
+                    int webViewHeight = size.y;
+
+                    //Check if the dialog is full screen
+                    if (insetPadding.bottom == 0 && insetPadding.top == 0) {
+                        //Handle full screen
+                        window.setLayout(webViewWidth, webViewHeight);
+
+                        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                    } else {
+                        // Calculates the dialog size
+                        double notificationWidth = 100 - (insetPadding.left + insetPadding.right);
+                        float widthPercentage = (float) notificationWidth / 100;
+                        int maxHeight = Math.min((int) (height * displayMetrics.scaledDensity), webViewHeight);
+                        int maxWidth = Math.min(webViewWidth, (int) (webViewWidth * widthPercentage));
+                        window.setLayout(maxWidth, maxHeight);
+
+                        //Calculates the horizontal position based on the dialog size
+                        double center = (insetPadding.left + notificationWidth / 2f);
+                        int offset = (int) ((center - 50) / 100f * webViewWidth);
+
+                        //Set the window properties
+                        WindowManager.LayoutParams wlp = window.getAttributes();
+                        wlp.x = offset;
+                        wlp.gravity = getVerticalLocation(insetPadding);
+                        wlp.dimAmount = (float) notification.backgroundAlpha;
+                        wlp.flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND;
+                        window.setAttributes(wlp);
+                    }
+                } catch (IllegalArgumentException e) {
+                    IterableLogger.e(TAG, "Exception while trying to resize an in-app message", e);
                 }
             }
         });

iterableapi/src/test/java/com/iterable/iterableapi/IterablePushActionReceiverTest.java

@@ -1,7 +1,10 @@
 package com.iterable.iterableapi;
 
+import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.RemoteInput;
 
 import org.json.JSONObject;
 import org.junit.After;
@@ -17,6 +20,7 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
+import static android.support.v4.app.RemoteInput.RESULTS_CLIP_LABEL;
 import static com.iterable.iterableapi.IterableTestUtils.stubAnyRequestReturningStatusCode;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
@@ -107,6 +111,33 @@ public void testPushActionWithSilentAction() throws Exception {
         assertNull(activityIntent);
     }
 
+    @Test
+    public void testPushActionWithTextInput() throws Exception {
+        IterablePushActionReceiver iterablePushActionReceiver = new IterablePushActionReceiver();
+        Intent intent = new Intent(IterableConstants.ACTION_PUSH_ACTION);
+        intent.putExtra(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER, "textInputButton");
+        intent.putExtra(IterableConstants.ITERABLE_DATA_KEY, IterableTestUtils.getResourceString("push_payload_action_buttons.json"));
+
+        // Inject input text
+        Bundle resultsBundle = new Bundle();
+        Intent clipDataIntent = new Intent();
+        resultsBundle.putString(IterableConstants.USER_INPUT, "input text");
+        clipDataIntent.putExtra(RemoteInput.EXTRA_RESULTS_DATA, resultsBundle);
+        intent.setClipData(ClipData.newIntent(RESULTS_CLIP_LABEL, clipDataIntent));
+
+        PowerMockito.mockStatic(IterableActionRunner.class);
+
+        iterablePushActionReceiver.onReceive(RuntimeEnvironment.application, intent);
+
+        // Verify that IterableActionRunner was called with the proper action
+        PowerMockito.verifyStatic(IterableActionRunner.class);
+        ArgumentCaptor<IterableAction> actionCaptor = ArgumentCaptor.forClass(IterableAction.class);
+        IterableActionRunner.executeAction(any(Context.class), actionCaptor.capture(), eq(IterableActionSource.PUSH));
+        IterableAction capturedAction = actionCaptor.getValue();
+        assertEquals("handleTextInput", capturedAction.getType());
+        assertEquals("input text", capturedAction.userInput);
+    }
+
     @Test
     public void testLegacyDeepLinkPayload() throws Exception {
         stubAnyRequestReturningStatusCode(server, 200, "{}");