Skip to content

[MOB - 8330] - Support for push with text input #728

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

Merged
evantk91 merged 9 commits into from
Jan 21, 2025
Merged

[MOB - 8330] - Support for push with text input #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c76e5ba
[MOB - 8330] - Support for push with text input
Apr 18, 2024
867ca52
Trigger Build
jyu115 Jul 24, 2024
8757ec9
Merge branch 'master' into MOB-8330-Support-For-Push-with-Text-Input
Ayyanchira Jul 24, 2024
f62d6c8
Merge branch 'master' into MOB-8330-Support-For-Push-with-Text-Input
evantk91 Sep 9, 2024
98a1c91
Merge branch 'master' into MOB-8330-Support-For-Push-with-Text-Input
Ayyanchira Dec 11, 2024
85fe021
Merge branch 'master' into MOB-8330-Support-For-Push-with-Text-Input
evantk91 Jan 21, 2025
e6f9a67
adds pending intent flags unit test
Jan 21, 2025
fc1c1d9
clean up
Jan 21, 2025
3a5a67a
clean up
Jan 21, 2025
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
8 changes: 6 additions & 2 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableNotificationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,21 @@ private PendingIntent getPendingIntent(Context context, IterableNotificationData
buttonIntent.putExtra(IterableConstants.ITERABLE_DATA_ACTION_IDENTIFIER, button.identifier);
buttonIntent.putExtra(IterableConstants.ACTION_IDENTIFIER, button.identifier);

int pendingIntentFlag = button.buttonType.equals(IterableNotificationData.Button.BUTTON_TYPE_TEXT_INPUT) ?
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE :
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;

if (button.openApp) {
IterableLogger.d(TAG, "Go through TrampolineActivity");
buttonIntent.setClass(context, IterableTrampolineActivity.class);
buttonIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
pendingButtonIntent = PendingIntent.getActivity(context, buttonIntent.hashCode(),
buttonIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
buttonIntent, pendingIntentFlag);
} else {
IterableLogger.d(TAG, "Go through IterablePushActionReceiver");
buttonIntent.setClass(context, IterablePushActionReceiver.class);
pendingButtonIntent = PendingIntent.getBroadcast(context, buttonIntent.hashCode(),
buttonIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
buttonIntent, pendingIntentFlag);
}

return pendingButtonIntent;
Expand Down
26 changes: 21 additions & 5 deletions iterableapi/src/test/java/com/iterable/iterableapi/IterableNotificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,34 @@ public void testNoAction() throws Exception {
}

@Test
public void testPendingIntentImmutable() throws Exception {
public void testPendingIntentFlags() throws Exception {
Bundle notif = new Bundle();
notif.putString(IterableConstants.ITERABLE_DATA_KEY, getResourceString("push_payload_action_buttons.json"));

IterableNotificationBuilder iterableNotification = postNotification(notif);
StatusBarNotification statusBarNotification = mNotificationManager.getActiveNotifications()[0];
Notification notification = statusBarNotification.getNotification();

assertTrue((shadowOf(notification.contentIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
assertTrue((shadowOf(notification.actions[0].actionIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
assertTrue((shadowOf(notification.actions[1].actionIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
assertTrue((shadowOf(notification.actions[2].actionIntent).getFlags() & PendingIntent.FLAG_IMMUTABLE) != 0);
// Test contentIntent (default action)
int contentIntentFlags = shadowOf(notification.contentIntent).getFlags();
assertTrue((contentIntentFlags & PendingIntent.FLAG_UPDATE_CURRENT) != 0);
assertTrue((contentIntentFlags & PendingIntent.FLAG_IMMUTABLE) != 0); // Should be immutable for default action

// Test deeplink button (default type, openApp=true)
int deeplinkButtonFlags = shadowOf(notification.actions[0].actionIntent).getFlags();
assertTrue((deeplinkButtonFlags & PendingIntent.FLAG_UPDATE_CURRENT) != 0);
assertTrue((deeplinkButtonFlags & PendingIntent.FLAG_IMMUTABLE) != 0); // Should be immutable for default type

// Test silent action button (default type, openApp=false)
int silentActionFlags = shadowOf(notification.actions[1].actionIntent).getFlags();
assertTrue((silentActionFlags & PendingIntent.FLAG_UPDATE_CURRENT) != 0);
assertTrue((silentActionFlags & PendingIntent.FLAG_IMMUTABLE) != 0); // Should be immutable for default type

// Test text input button
int textInputFlags = shadowOf(notification.actions[2].actionIntent).getFlags();
assertTrue((textInputFlags & PendingIntent.FLAG_UPDATE_CURRENT) != 0);
assertTrue((textInputFlags & PendingIntent.FLAG_MUTABLE) != 0); // Should be mutable for text input

}

}
Loading