-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #404 from Iterable/MOB-3754-Handling-Trampoline-Re…
…striction [MOB - 3754] - Handling Trampoline Restriction
- Loading branch information
Showing
8 changed files
with
251 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 3 additions & 133 deletions
136
iterableapi/src/main/java/com/iterable/iterableapi/IterablePushActionReceiver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,153 +1,23 @@ | ||
| package com.iterable.iterableapi; | ||
|
|
||
| import android.app.NotificationManager; | ||
| import android.content.BroadcastReceiver; | ||
| import android.content.Context; | ||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
|
|
||
| import androidx.core.app.RemoteInput; | ||
|
|
||
| import org.json.JSONException; | ||
| import org.json.JSONObject; | ||
|
|
||
| /** | ||
| * Handles incoming push actions built by {@link IterableNotificationBuilder} | ||
| * Action id is passed in the Intent extras under {@link IterableConstants#REQUEST_CODE} | ||
| */ | ||
| public class IterablePushActionReceiver extends BroadcastReceiver { | ||
| private static final String TAG = "IterablePushActionReceiver"; | ||
| // Used to hold intents until the SDK is initialized | ||
| private static PendingAction pendingAction = null; | ||
|
|
||
| @Override | ||
| public void onReceive(Context context, Intent intent) { | ||
| // Dismiss the notification | ||
| int requestCode = intent.getIntExtra(IterableConstants.REQUEST_CODE, 0); | ||
| NotificationManager mNotificationManager = (NotificationManager) | ||
| context.getSystemService(Context.NOTIFICATION_SERVICE); | ||
| mNotificationManager.cancel(requestCode); | ||
|
|
||
| // Dismiss the notifications panel | ||
| try { | ||
| context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); | ||
| } catch (SecurityException e) { | ||
| IterableLogger.w(TAG, e.getLocalizedMessage()); | ||
| } | ||
|
|
||
| IterablePushNotificationUtil.dismissNotification(context, intent); | ||
| IterablePushNotificationUtil.dismissNotificationPanel(context); | ||
| String actionName = intent.getAction(); | ||
| if (IterableConstants.ACTION_PUSH_ACTION.equalsIgnoreCase(actionName)) { | ||
| handlePushAction(context, intent); | ||
| } | ||
| } | ||
|
|
||
| static boolean processPendingAction(Context context) { | ||
| boolean handled = false; | ||
| if (pendingAction != null) { | ||
| handled = executeAction(context, pendingAction); | ||
| pendingAction = null; | ||
| IterablePushNotificationUtil.handlePushAction(context, intent); | ||
| } | ||
| return handled; | ||
| } | ||
|
|
||
| private static void handlePushAction(Context context, Intent intent) { | ||
| if (intent.getExtras() == null) { | ||
| IterableLogger.e(TAG, "handlePushAction: extras == null, can't handle push action"); | ||
| return; | ||
| } | ||
| IterableNotificationData notificationData = new IterableNotificationData(intent.getExtras()); | ||
| String actionIdentifier = intent.getStringExtra(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER); | ||
| IterableAction action = null; | ||
| JSONObject dataFields = new JSONObject(); | ||
|
|
||
| boolean openApp = true; | ||
|
|
||
| if (actionIdentifier != null) { | ||
| try { | ||
| if (actionIdentifier.equals(IterableConstants.ITERABLE_ACTION_DEFAULT)) { | ||
| // Default action (click on a push) | ||
| dataFields.put(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER, IterableConstants.ITERABLE_ACTION_DEFAULT); | ||
| action = notificationData.getDefaultAction(); | ||
| if (action == null) { | ||
| action = getLegacyDefaultActionFromPayload(intent.getExtras()); | ||
| } | ||
| } else { | ||
| dataFields.put(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER, actionIdentifier); | ||
| IterableNotificationData.Button button = notificationData.getActionButton(actionIdentifier); | ||
| action = button.action; | ||
| openApp = button.openApp; | ||
|
|
||
| if (button.buttonType.equals(IterableNotificationData.Button.BUTTON_TYPE_TEXT_INPUT)) { | ||
| Bundle results = RemoteInput.getResultsFromIntent(intent); | ||
| if (results != null) { | ||
| String userInput = results.getString(IterableConstants.USER_INPUT); | ||
| if (userInput != null) { | ||
| dataFields.putOpt(IterableConstants.KEY_USER_TEXT, userInput); | ||
| action.userInput = userInput; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } catch (JSONException e) { | ||
| IterableLogger.e(TAG, "Encountered an exception while trying to handle the push action", e); | ||
| } | ||
| } | ||
|
|
||
| pendingAction = new PendingAction(intent, notificationData, action, openApp, dataFields); | ||
|
|
||
| boolean handled = false; | ||
| if (IterableApi.getInstance().getMainActivityContext() != null) { | ||
| handled = processPendingAction(context); | ||
| } | ||
|
|
||
| // Open the launcher activity if the action was not handled by anything, and openApp is true | ||
| if (openApp && !handled) { | ||
| Intent launcherIntent = IterableNotificationHelper.getMainActivityIntent(context); | ||
| launcherIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); | ||
| if (launcherIntent.resolveActivity(context.getPackageManager()) != null) { | ||
| context.startActivity(launcherIntent); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static boolean executeAction(Context context, PendingAction action) { | ||
| // Automatic tracking | ||
| IterableApi.sharedInstance.setPayloadData(action.intent); | ||
| IterableApi.sharedInstance.setNotificationData(action.notificationData); | ||
| IterableApi.sharedInstance.trackPushOpen(action.notificationData.getCampaignId(), action.notificationData.getTemplateId(), | ||
| action.notificationData.getMessageId(), action.dataFields); | ||
|
|
||
| return IterableActionRunner.executeAction(context, action.iterableAction, IterableActionSource.PUSH); | ||
| } | ||
|
|
||
| private static IterableAction getLegacyDefaultActionFromPayload(Bundle extras) { | ||
| try { | ||
| if (extras.containsKey(IterableConstants.ITERABLE_DATA_DEEP_LINK_URL)) { | ||
| JSONObject actionJson = new JSONObject(); | ||
| actionJson.put("type", IterableAction.ACTION_TYPE_OPEN_URL); | ||
| actionJson.put("data", extras.getString(IterableConstants.ITERABLE_DATA_DEEP_LINK_URL)); | ||
| return IterableAction.from(actionJson); | ||
| } | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private static class PendingAction { | ||
| Intent intent; | ||
| IterableNotificationData notificationData; | ||
| IterableAction iterableAction; | ||
| boolean openApp; | ||
| JSONObject dataFields; | ||
|
|
||
| PendingAction(Intent intent, IterableNotificationData notificationData, IterableAction iterableAction, boolean openApp, JSONObject dataFields) { | ||
| this.intent = intent; | ||
| this.notificationData = notificationData; | ||
| this.iterableAction = iterableAction; | ||
| this.openApp = openApp; | ||
| this.dataFields = dataFields; | ||
| } | ||
| } | ||
|
|
||
| } |
142 changes: 142 additions & 0 deletions
142
iterableapi/src/main/java/com/iterable/iterableapi/IterablePushNotificationUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| package com.iterable.iterableapi; | ||
|
|
||
| import android.app.NotificationManager; | ||
| import android.content.Context; | ||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
|
|
||
| import androidx.core.app.RemoteInput; | ||
|
|
||
| import org.json.JSONException; | ||
| import org.json.JSONObject; | ||
|
|
||
| class IterablePushNotificationUtil { | ||
| private static PendingAction pendingAction = null; | ||
| private static final String TAG = "IterablePushNotificationUtil"; | ||
|
|
||
| static boolean processPendingAction(Context context) { | ||
| boolean handled = false; | ||
| if (pendingAction != null) { | ||
| handled = executeAction(context, pendingAction); | ||
| pendingAction = null; | ||
| } | ||
| return handled; | ||
| } | ||
|
|
||
| static boolean executeAction(Context context, PendingAction action) { | ||
| // Automatic tracking | ||
| IterableApi.sharedInstance.setPayloadData(action.intent); | ||
| IterableApi.sharedInstance.setNotificationData(action.notificationData); | ||
| IterableApi.sharedInstance.trackPushOpen(action.notificationData.getCampaignId(), action.notificationData.getTemplateId(), | ||
| action.notificationData.getMessageId(), action.dataFields); | ||
|
|
||
| return IterableActionRunner.executeAction(context, action.iterableAction, IterableActionSource.PUSH); | ||
| } | ||
|
|
||
|
|
||
| static void handlePushAction(Context context, Intent intent) { | ||
| if (intent.getExtras() == null) { | ||
| IterableLogger.e(TAG, "handlePushAction: extras == null, can't handle push action"); | ||
| return; | ||
| } | ||
| IterableNotificationData notificationData = new IterableNotificationData(intent.getExtras()); | ||
| String actionIdentifier = intent.getStringExtra(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER); | ||
| IterableAction action = null; | ||
| JSONObject dataFields = new JSONObject(); | ||
|
|
||
| boolean openApp = true; | ||
|
|
||
| if (actionIdentifier != null) { | ||
| try { | ||
| if (actionIdentifier.equals(IterableConstants.ITERABLE_ACTION_DEFAULT)) { | ||
| // Default action (click on a push) | ||
| dataFields.put(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER, IterableConstants.ITERABLE_ACTION_DEFAULT); | ||
| action = notificationData.getDefaultAction(); | ||
| if (action == null) { | ||
| action = getLegacyDefaultActionFromPayload(intent.getExtras()); | ||
| } | ||
| } else { | ||
| dataFields.put(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER, actionIdentifier); | ||
| IterableNotificationData.Button button = notificationData.getActionButton(actionIdentifier); | ||
| action = button.action; | ||
| openApp = button.openApp; | ||
|
|
||
| if (button.buttonType.equals(IterableNotificationData.Button.BUTTON_TYPE_TEXT_INPUT)) { | ||
| Bundle results = RemoteInput.getResultsFromIntent(intent); | ||
| if (results != null) { | ||
| String userInput = results.getString(IterableConstants.USER_INPUT); | ||
| if (userInput != null) { | ||
| dataFields.putOpt(IterableConstants.KEY_USER_TEXT, userInput); | ||
| action.userInput = userInput; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } catch (JSONException e) { | ||
| IterableLogger.e(TAG, "Encountered an exception while trying to handle the push action", e); | ||
| } | ||
| } | ||
| pendingAction = new PendingAction(intent, notificationData, action, openApp, dataFields); | ||
|
|
||
| boolean handled = false; | ||
| if (IterableApi.getInstance().getMainActivityContext() != null) { | ||
| handled = processPendingAction(context); | ||
| } | ||
|
|
||
| // Open the launcher activity if the action was not handled by anything, and openApp is true | ||
| if (openApp && !handled) { | ||
| Intent launcherIntent = IterableNotificationHelper.getMainActivityIntent(context); | ||
| launcherIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); | ||
| if (launcherIntent.resolveActivity(context.getPackageManager()) != null) { | ||
| context.startActivity(launcherIntent); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static IterableAction getLegacyDefaultActionFromPayload(Bundle extras) { | ||
| try { | ||
| if (extras.containsKey(IterableConstants.ITERABLE_DATA_DEEP_LINK_URL)) { | ||
| JSONObject actionJson = new JSONObject(); | ||
| actionJson.put("type", IterableAction.ACTION_TYPE_OPEN_URL); | ||
| actionJson.put("data", extras.getString(IterableConstants.ITERABLE_DATA_DEEP_LINK_URL)); | ||
| return IterableAction.from(actionJson); | ||
| } | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private static class PendingAction { | ||
| Intent intent; | ||
| IterableNotificationData notificationData; | ||
| IterableAction iterableAction; | ||
| boolean openApp; | ||
| JSONObject dataFields; | ||
|
|
||
| PendingAction(Intent intent, IterableNotificationData notificationData, IterableAction iterableAction, boolean openApp, JSONObject dataFields) { | ||
| this.intent = intent; | ||
| this.notificationData = notificationData; | ||
| this.iterableAction = iterableAction; | ||
| this.openApp = openApp; | ||
| this.dataFields = dataFields; | ||
| } | ||
| } | ||
|
|
||
| static void dismissNotificationPanel(Context context) { | ||
| // Dismiss the notifications panel | ||
| try { | ||
| context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); | ||
| } catch (SecurityException e) { | ||
| IterableLogger.w(TAG, e.getLocalizedMessage()); | ||
| } | ||
| } | ||
|
|
||
| static void dismissNotification(Context context, Intent notificationIntent) { | ||
| // Dismiss the notification | ||
| int requestCode = notificationIntent.getIntExtra(IterableConstants.REQUEST_CODE, 0); | ||
| NotificationManager mNotificationManager = (NotificationManager) | ||
| context.getSystemService(Context.NOTIFICATION_SERVICE); | ||
| mNotificationManager.cancel(requestCode); | ||
| } | ||
| } |
Oops, something went wrong.