Merge master into embedded

.github/workflows/jira.yml

@@ -0,0 +1,27 @@
+on:
+  issues:
+    types: [opened]
+
+name: Create Jira Issue
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Create Jira Issue
+    steps:
+      - name: Login
+        uses: atlassian/gajira-login@v3
+        env:
+          JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
+          JIRA_USER_EMAIL: ${{ secrets.JIRA_ILYA_USER_EMAIL }}
+          JIRA_API_TOKEN: ${{ secrets.JIRA_ILYA_API_TOKEN }}
+
+      - name: Create
+        id: create
+        uses: atlassian/gajira-create@v3
+        with:
+          project: MOB
+          issuetype: Bug
+          summary: "${{ github.repository }}: #${{ github.event.issue.number }} by ${{ github.event.issue.user.login }}: ${{ github.event.issue.title }}"
+          description: ${{ github.event.issue.body }}
+          fields: '{"customfield_11268": {"id": "10668"} }'

README.md

@@ -45,29 +45,30 @@ For sample code, take a look at:
 
 Release notes:
 
-- [Android SDK Release Notes](https://support.iterable.com/hc/articles/360027543332) (major releases)
-- [Releases page](https://github.com/Iterable/iterable-android-sdk/releases) on GitHub (minor releases)
+- [Release Notes - Iterable's Android SDK](https://support.iterable.com/hc/articles/360027543332) -
+  Release notes for significant updates to the SDK. Also, information about 
+  deprecation dates and support windows.
+- [GitHub — Releases](https://github.com/Iterable/iterable-android-sdk/releases) -
+  This repository's **Releases** page. Release notes for all versions of the SDK.
 
 Support policies:
 
-- Iterable's [Mobile SDK Support Policy](https://support.iterable.com/hc/articles/360046136171)
-- Iterable's [Android SDK Deprecation and End-of-Life Schedule](https://support.iterable.com/hc/articles/360027543332#deprecation-and-end-of-life-schedule)
-- Iterable's [Beta Mobile SDK Disclaimer](https://support.iterable.com/hc/articles/360034753412)
+- Iterable's [SDK Support Policy](https://support.iterable.com/hc/articles/360046136171)
+- Iterable's [Beta SDK Disclaimer](https://support.iterable.com/hc/articles/360034753412)
 
 Troubleshooting:
 
 - [Testing and Troubleshooting Iterable's Mobile SDKs](https://support.iterable.com/hc/articles/360035392251)
 - [Frequently Asked Questions](https://support.iterable.com/hc/articles/360035624191) 
   for mobile developers integrating with Iterable
 
-Please contact your customer success manager with any questions.
+Questions? Contact your Iterable customer success manager.
 
 ## License
 
-This SDK is released under the MIT License. See [LICENSE](https://github.com/Iterable/iterable-android-sdk/blob/master/LICENSE?raw=true)
-for more information.
+This SDK is released under the MIT License. For more information, read [LICENSE](LICENSE.md).
 
 ## Want to contribute?
 
 This library is open source, and we will look at issue reports and pull requests.
-See [CONTRIBUTING](CONTRIBUTING.md) for more information.
+For more information, read [CONTRIBUTING](CONTRIBUTING.md).

app/build.gradle

@@ -3,6 +3,10 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'jacoco'
 
+repositories {
+    mavenCentral()
+}
+
 android {
     compileSdkVersion 29
     buildToolsVersion '29.0.3'

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/inbox/IterableInboxFragment.java

@@ -244,7 +244,7 @@ public void onInboxUpdated() {
 
     @Override
     public void onListItemTapped(@NonNull IterableInAppMessage message) {
-        IterableApi.getInstance().getInAppManager().setRead(message, true);
+        IterableApi.getInstance().getInAppManager().setRead(message, true, null, null);
 
         if (inboxMode == InboxMode.ACTIVITY) {
             startActivity(new Intent(getContext(), IterableInboxMessageActivity.class).putExtra(IterableInboxMessageActivity.ARG_MESSAGE_ID, message.getMessageId()));

iterableapi/build.gradle

@@ -52,7 +52,7 @@ dependencies {
     testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
     testImplementation 'org.skyscreamer:jsonassert:1.5.0'
-    testImplementation project(path: ':iterableapi')
+
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

iterableapi/src/main/AndroidManifest.xml

@@ -25,7 +25,8 @@
         <activity
             android:name=".IterableTrampolineActivity"
             android:exported="false"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
+            android:excludeFromRecents="true"
             android:theme="@style/TrampolineActivity.Transparent"/>
     </application>
 

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

@@ -3,13 +3,14 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.iterable.iterableapi.util.DeviceInfoUtils;
+
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -57,10 +58,8 @@ public void onActivityStarted(Activity activity) {
         @Override
         public void onActivityResumed(Activity activity) {
             currentActivity = new WeakReference<>(activity);
-            String amazonFireTvHardware = "amazon.hardware.fire_tv";
-            String amazonModel = Build.MODEL;
 
-            if (!inForeground || amazonModel.matches("AFTN") || activity.getPackageManager().hasSystemFeature(amazonFireTvHardware)) {
+            if (!inForeground || DeviceInfoUtils.isFireTV(activity.getPackageManager())) {
                 inForeground = true;
                 for (WeakReference<AppStateCallback> callback : callbacks) {
                     if (callback.get() != null) {

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

@@ -11,6 +11,8 @@
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 
+import com.iterable.iterableapi.util.DeviceInfoUtils;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -38,6 +40,8 @@ public class IterableApi {
     private IterableNotificationData _notificationData;
     private String _deviceId;
     private boolean _firstForegroundHandled;
+    private IterableHelper.SuccessHandler _setUserSuccessCallbackHandler;
+    private IterableHelper.FailureHandler _setUserFailureCallbackHandler;
 
     IterableApiClient apiClient = new IterableApiClient(new IterableApiAuthProvider());
     private @Nullable IterableInAppManager inAppManager;
@@ -69,15 +73,15 @@ public void execute(@Nullable String data) {
         });
     }
 
-    String getEmail() {
+    public String getEmail() {
         return _email;
     }
 
-    String getUserId() {
+    public String getUserId() {
         return _userId;
     }
 
-    String getAuthToken() {
+    public String getAuthToken() {
         return _authToken;
     }
 
@@ -315,6 +319,8 @@ private void completeUserLogin() {
 
         if (config.autoPushRegistration) {
             registerForPush();
+        } else if (_setUserSuccessCallbackHandler != null) {
+            _setUserSuccessCallbackHandler.onSuccess(new JSONObject()); // passing blank json object here as onSuccess is @Nonnull
         }
 
         getInAppManager().syncInApp();
@@ -347,7 +353,7 @@ private boolean isInitialized() {
 
     private boolean checkSDKInitialization() {
         if (!isInitialized()) {
-            IterableLogger.e(TAG, "Iterable SDK must be initialized with an API key and user email/userId before calling SDK methods");
+            IterableLogger.w(TAG, "Iterable SDK must be initialized with an API key and user email/userId before calling SDK methods");
             return false;
         }
         return true;
@@ -386,8 +392,13 @@ private void retrieveEmailAndUserId() {
             _email = prefs.getString(IterableConstants.SHARED_PREFS_EMAIL_KEY, null);
             _userId = prefs.getString(IterableConstants.SHARED_PREFS_USERID_KEY, null);
             _authToken = prefs.getString(IterableConstants.SHARED_PREFS_AUTH_TOKEN_KEY, null);
-            if (_authToken != null) {
-                getAuthManager().queueExpirationRefresh(_authToken);
+            if (config.authHandler != null) {
+                if (_authToken != null) {
+                    getAuthManager().queueExpirationRefresh(_authToken);
+                } else {
+                    IterableLogger.d(TAG, "Auth token found as null. Scheduling token refresh in 10 seconds...");
+                    getAuthManager().scheduleAuthTokenRefresh(10000);
+                }
             }
         } catch (Exception e) {
             IterableLogger.e(TAG, "Error while retrieving email/userId/authToken", e);
@@ -503,7 +514,7 @@ protected void registerDeviceToken(@Nullable String email, @Nullable String user
             IterableLogger.e(TAG, "registerDeviceToken: applicationName is null, check that pushIntegrationName is set in IterableConfig");
         }
 
-        apiClient.registerDeviceToken(email, userId, authToken, applicationName, deviceToken, dataFields, deviceAttributes);
+        apiClient.registerDeviceToken(email, userId, authToken, applicationName, deviceToken, dataFields, deviceAttributes, _setUserSuccessCallbackHandler, _setUserFailureCallbackHandler);
     }
 //endregion
 
@@ -533,8 +544,11 @@ public static void initialize(@NonNull Context context, @NonNull String apiKey,
         IterableActivityMonitor.getInstance().addCallback(sharedInstance.activityMonitorListener);
 
         if (sharedInstance.inAppManager == null) {
-            sharedInstance.inAppManager = new IterableInAppManager(sharedInstance, sharedInstance.config.inAppHandler,
-                    sharedInstance.config.inAppDisplayInterval);
+            sharedInstance.inAppManager = new IterableInAppManager(
+                    sharedInstance,
+                    sharedInstance.config.inAppHandler,
+                    sharedInstance.config.inAppDisplayInterval,
+                    sharedInstance.config.useInMemoryStorageForInApps);
         }
 
         if (sharedInstance.embeddedManager == null) {
@@ -543,6 +557,17 @@ public static void initialize(@NonNull Context context, @NonNull String apiKey,
 
         loadLastSavedConfiguration(context);
         IterablePushNotificationUtil.processPendingAction(context);
+        if (DeviceInfoUtils.isFireTV(context.getPackageManager())) {
+            try {
+                JSONObject dataFields = new JSONObject();
+                JSONObject deviceDetails = new JSONObject();
+                DeviceInfoUtils.populateDeviceDetails(deviceDetails, context, sharedInstance.getDeviceId());
+                dataFields.put(IterableConstants.KEY_FIRETV, deviceDetails);
+                sharedInstance.apiClient.updateUser(dataFields, false);
+            } catch (JSONException e) {
+                    IterableLogger.e(TAG, "initialize: exception", e);
+            }
+        }
     }
 
     public static void setContext(Context context) {
@@ -612,10 +637,18 @@ public IterableAttributionInfo getAttributionInfo() {
     }
 
     public void setEmail(@Nullable String email) {
-        setEmail(email, null);
+        setEmail(email, null, null, null);
+    }
+
+    public void setEmail(@Nullable String email, @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
+        setEmail(email, null, successHandler, failureHandler);
     }
 
     public void setEmail(@Nullable String email, @Nullable String authToken) {
+        setEmail(email, authToken, null, null);
+    }
+
+    public void setEmail(@Nullable String email, @Nullable String authToken, @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
         //Only if passed in same non-null email
         if (_email != null && _email.equals(email)) {
             checkAndUpdateAuthToken(authToken);
@@ -630,16 +663,26 @@ public void setEmail(@Nullable String email, @Nullable String authToken) {
 
         _email = email;
         _userId = null;
+        _setUserSuccessCallbackHandler = successHandler;
+        _setUserFailureCallbackHandler = failureHandler;
         storeAuthData();
 
         onLogin(authToken);
     }
 
     public void setUserId(@Nullable String userId) {
-        setUserId(userId, null);
+        setUserId(userId, null, null, null);
+    }
+
+    public void setUserId(@Nullable String userId, @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
+        setUserId(userId, null, successHandler, failureHandler);
     }
 
     public void setUserId(@Nullable String userId, @Nullable String authToken) {
+        setUserId(userId, authToken, null, null);
+    }
+
+    public void setUserId(@Nullable String userId, @Nullable String authToken, @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
         //If same non null userId is passed
         if (_userId != null && _userId.equals(userId)) {
             checkAndUpdateAuthToken(authToken);
@@ -654,6 +697,8 @@ public void setUserId(@Nullable String userId, @Nullable String authToken) {
 
         _email = null;
         _userId = userId;
+        _setUserSuccessCallbackHandler = successHandler;
+        _setUserFailureCallbackHandler = failureHandler;
         storeAuthData();
 
         onLogin(authToken);
@@ -740,7 +785,26 @@ public void inAppConsume(@NonNull String messageId) {
             IterableLogger.e(TAG, "inAppConsume: message is null");
             return;
         }
-        inAppConsume(message, null, null);
+        inAppConsume(message, null, null, null, null);
+        IterableLogger.printInfo();
+    }
+
+    /**
+     * Consumes an InApp message.
+     * @param messageId
+     * @param successHandler The callback which returns `success`.
+     * @param failureHandler The callback which returns `failure`.
+     */
+    public void inAppConsume(@NonNull String messageId, @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
+        IterableInAppMessage message = getInAppManager().getMessageById(messageId);
+        if (message == null) {
+            IterableLogger.e(TAG, "inAppConsume: message is null");
+            if (failureHandler != null) {
+                failureHandler.onFailure("inAppConsume: message is null", null);
+            }
+            return;
+        }
+        inAppConsume(message, null, null, successHandler, failureHandler);
         IterableLogger.printInfo();
     }
 
@@ -757,8 +821,25 @@ public void inAppConsume(@NonNull IterableInAppMessage message, @Nullable Iterab
         if (!checkSDKInitialization()) {
             return;
         }
+        apiClient.inAppConsume(message, source, clickLocation, inboxSessionId, null, null);
+    }
 
-        apiClient.inAppConsume(message, source, clickLocation, inboxSessionId);
+    /**
+     * Tracks InApp delete.
+     * This method from informs Iterable about inApp messages deleted with additional paramters.
+     * Call this method from places where inApp deletion are invoked by user. The messages can be swiped to delete or can be deleted using the link to delete button.
+     *
+     * @param message message object
+     * @param source An enum describing how the in App delete was triggered
+     * @param clickLocation The module in which the action happened
+     * @param successHandler The callback which returns `success`.
+     * @param failureHandler The callback which returns `failure`.
+     */
+    public void inAppConsume(@NonNull IterableInAppMessage message, @Nullable IterableInAppDeleteActionType source, @Nullable IterableInAppLocation clickLocation, @Nullable IterableHelper.SuccessHandler successHandler, @Nullable IterableHelper.FailureHandler failureHandler) {
+        if (!checkSDKInitialization()) {
+            return;
+        }
+        apiClient.inAppConsume(message, source, clickLocation, inboxSessionId, successHandler, failureHandler);
     }
 
     /**