Skip to content

Add firetv/ott support to getmessages call #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add firetv/ott support to getmessages call #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableActivityMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.iterable.iterableapi.util.BrandUtils;

import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
Expand Down Expand Up @@ -57,10 +59,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 || BrandUtils.isFireTV(activity.getPackageManager())) {
inForeground = true;
for (WeakReference<AppStateCallback> callback : callbacks) {
if (callback.get() != null) {
Expand Down
4 changes: 3 additions & 1 deletion iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import androidx.annotation.Nullable;
import androidx.core.app.NotificationManagerCompat;

import com.iterable.iterableapi.util.BrandUtils;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Expand Down Expand Up @@ -204,7 +206,7 @@ public void getInAppMessages(int count, @NonNull IterableHelper.IterableActionHa
try {
addEmailOrUserIdToJson(requestJSON);
requestJSON.put(IterableConstants.ITERABLE_IN_APP_COUNT, count);
requestJSON.put(IterableConstants.KEY_PLATFORM, IterableConstants.ITBL_PLATFORM_ANDROID);
requestJSON.put(IterableConstants.KEY_PLATFORM, BrandUtils.isFireTV(authProvider.getContext().getPackageManager()) ? IterableConstants.ITBL_PLATFORM_OTT : IterableConstants.ITBL_PLATFORM_ANDROID);
requestJSON.put(IterableConstants.ITBL_KEY_SDK_VERSION, IterableConstants.ITBL_KEY_SDK_VERSION_NUMBER);
requestJSON.put(IterableConstants.ITBL_SYSTEM_VERSION, Build.VERSION.RELEASE);
requestJSON.put(IterableConstants.KEY_PACKAGE_NAME, authProvider.getContext().getPackageName());
Expand Down
1 change: 1 addition & 0 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ public final class IterableConstants {

public static final String ITBL_KEY_SDK_VERSION = "SDKVersion";
public static final String ITBL_PLATFORM_ANDROID = "Android";
public static final String ITBL_PLATFORM_OTT = "OTT";
public static final String ITBL_KEY_SDK_VERSION_NUMBER = BuildConfig.ITERABLE_SDK_VERSION;
public static final String ITBL_SYSTEM_VERSION = "systemVersion";

Expand Down
21 changes: 21 additions & 0 deletions iterableapi/src/main/java/com/iterable/iterableapi/util/BrandUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.iterable.iterableapi.util;

import android.app.Activity;
import android.content.pm.PackageManager;
import android.os.Build;

public final class BrandUtils {

private BrandUtils() {
}

public static boolean isFireTV(PackageManager packageManager) {
String amazonFireTvHardware = "amazon.hardware.fire_tv";
String amazonModel = Build.MODEL;
if (amazonModel.matches("AFTN") || packageManager.hasSystemFeature(amazonFireTvHardware)) {
return true;
} else {
return false;
}
}
}