Merge branch 'stable'

# Conflicts:
#	iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java

Author: vbabenkoru

README.md

@@ -23,6 +23,8 @@ The platform will be `GCM` (This also includes FCM since it runs off of the same
 
 ![Creating an integration in Iterable](https://support.iterable.com/hc/en-us/article_attachments/211841066/2016-12-08_1442.png)
 
+For more details, see our [setup guide](https://support.iterable.com/hc/en-us/articles/115000331943-Setting-up-Android-Push-Notifications) on Iterable support website.
+
 Congratulations, you've configured your mobile application to receive push notifications! Now, let's set up the Iterable SDK...
 
 # Installing the SDK
@@ -70,13 +72,12 @@ Note that `FirebaseInstanceIdService` is deprecated and replaced with `onNewToke
 	```
 
   * The `apiKey` should correspond to the API key of your project in Iterable. If you'd like, you can specify a different `apiKey` depending on whether you're building in `DEBUG` or `PRODUCTION`, and point the SDK to the relevant Iterable project.
-  * It is possible to call this elsewhere but we strongly encourage initializing the SDK in `Application`'s `onCreate`. This will let the SDK automatically track a push open for you if the application was launched from a remote Iterable push notification.
+  > ⚠ Don't call `IterableApi.initialize` from `Activity#onCreate`; it is necessary for Iterable SDK to be initialized when the application is starting, to make sure everything is set up regardless of whether the app is launched to open an activity or is woken up in background as a result of an incoming push message.
 
 2. Once you know the email *(Preferred)* or userId of the user, call `setEmail` or `setUserId`
   * EMAIL: `IterableApi.getInstance().setEmail("[email protected]");`
   * USERID: `IterableApi.getInstance().setUserId("userId");`
-      * If you are setting a userId, an existing user must already exist for that userId
-      * It is preferred that you use Email since that doesn't require an additional lookup by userId call on the backend.
+   > ⚠ 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`:

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

@@ -998,9 +998,9 @@ public void trackInAppOpen(String messageId) {
     /**
      * Tracks an InApp click.
      * @param messageId
-     * @param urlClick
+     * @param clickedUrl
      */
-    public void trackInAppClick(String messageId, String urlClick) {
+    public void trackInAppClick(String messageId, String clickedUrl) {
         if (!checkSDKInitialization()) {
             return;
         }
@@ -1010,7 +1010,7 @@ public void trackInAppClick(String messageId, String urlClick) {
         try {
             addEmailOrUserIdToJson(requestJSON);
             requestJSON.put(IterableConstants.KEY_MESSAGE_ID, messageId);
-            requestJSON.put(IterableConstants.ITERABLE_IN_APP_URL_CLICK, urlClick);
+            requestJSON.put(IterableConstants.ITERABLE_IN_APP_CLICKED_URL, clickedUrl);
 
             sendPostRequest(IterableConstants.ENDPOINT_TRACK_INAPP_CLICK, requestJSON);
         }

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

@@ -161,7 +161,7 @@ public final class IterableConstants {
     public static final String ITERABLE_IN_APP_TEXT             = "text";
     public static final String ITERABLE_IN_APP_TITLE            = "title";
     public static final String ITERABLE_IN_APP_TYPE             = "displayType";
-    public static final String ITERABLE_IN_APP_URL_CLICK        = "urlClick";
+    public static final String ITERABLE_IN_APP_CLICKED_URL      = "clickedUrl";
     public static final String ITERABLE_IN_APP_HTML             = "html";
     public static final String ITERABLE_IN_APP_EXPIRES_AT       = "expiresAt";
     public static final String ITERABLE_IN_APP_CUSTOM_PAYLOAD   = "customPayload";

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

@@ -48,7 +48,7 @@ static boolean isIterableDeeplink(String url) {
 
     private static class RedirectTask extends AsyncTask<String, Void, String> {
         static final String TAG = "RedirectTask";
-        static final int DEFAULT_TIMEOUT_MS = 1000;   //1 seconds
+        static final int DEFAULT_TIMEOUT_MS = 3000;   //3 seconds
 
         private IterableHelper.IterableActionHandler callback;