Skip to content
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

Remove activity related flags in notification intent #1370

Merged
merged 6 commits into from
Dec 10, 2019
+69 −36
Merged

Remove activity related flags in notification intent #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df36260
Remove activity related flags in notification intent
Dec 9, 2019
7d8380e
Merge branch 'develop' into vb/pinpoint-notification-intent-flags
Dec 9, 2019
bf2423d
Remove activity related flags in notification intent
Dec 9, 2019
9584fd0
Remove activity related flags in notification intent
Dec 9, 2019
614aee7
Delete dbnavigator.xml
Dec 10, 2019
ba7fdb2
Update NotificationClientBase.java
Dec 10, 2019
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Release 2.16.5](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.16.5)

### Bu Fixes

- **Amazon Pinpoint**
- Fixed a bug where setting `Intent.FLAG_ACTIVITY_CLEAR_TOP` and `Intent.FLAG_ACTIVITY_SINGLE_TOP` on the `notificationIntent` being created for displaying notification causes a crash in Android OS Versions < 4.4. The fix involves removing the setting of flags as it is not relavent for an intent that communicates with a Android Service and a Broadcast receiver. See [PR #1370](https://github.com/aws-amplify/aws-sdk-android/pull/1370) for details.

### Misc. Updates

- Model updates for the following services
Expand Down
100 changes: 64 additions & 36 deletions ...om/amazonaws/mobileconnectors/pinpoint/targeting/notification/NotificationClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,23 +652,41 @@ private Notification createNotification(final int iconResId, final String title,
* Handles creation of the open app PendingIntent. Implementors of this method will need to
* decide on how to create the intent based on the provided action.
*
* @param pushBundle the data to push
* @param targetClass the class that handles receiving messages.
* @param campaignId pinpoint campaign id
* @param requestId request id
* @param intentAction intent action
* @param data the data to push
* @param intentReceiver the class that handles receiving messages.
* @param campaignId pinpoint campaign id
* @param requestId request id
* @param intentAction intent action
* @return {@link PendingIntent}
*/
protected abstract PendingIntent createOpenAppPendingIntent(final Bundle pushBundle, final Class<?> targetClass, final String campaignId,
final int requestId, final String intentAction);
protected abstract PendingIntent createOpenAppPendingIntent(
final Bundle data,
final Class<?> intentReceiver,
final String campaignId,
final int requestId,
final String intentAction);


protected final Intent notificationIntent(final Bundle pushBundle, final String campaignId, final int requestId, final String intentAction,
final Class<?> targetClass) {
final Intent notificationIntent = new Intent(pinpointContext.getApplicationContext(), targetClass);
notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
/**
* Creates a notification intent for the given set of parameters of an
* intent.
*
* @param data the data to push
* @param campaignId identifies the pinpoint campaign
* @param requestId identifies the notification request
* @param intentAction specifies the action of the intent
* @param intentReceiver the target class that handles receiving messages.
* @return
*/
final Intent notificationIntent(
final Bundle data,
final String campaignId,
final int requestId,
final String intentAction,
final Class<?> intentReceiver) {
final Intent notificationIntent = new Intent(pinpointContext.getApplicationContext(), intentReceiver);
notificationIntent.setAction(intentAction);
notificationIntent.putExtras(pushBundle);
notificationIntent.putExtras(data);
notificationIntent.putExtra(INTENT_SNS_NOTIFICATION_FROM, AWS_EVENT_TYPE_OPENED);
notificationIntent.putExtra(CAMPAIGN_ID_PUSH_KEY, campaignId);
notificationIntent.putExtra(REQUEST_ID, requestId);
Expand All @@ -685,7 +703,7 @@ protected final Intent notificationIntent(final Bundle pushBundle, final String
int getNotificationRequestId(final String campaignId,
final String activityId) {
// Adding a random unique identifier for direct sends. For a campaign,
// use the campaingId and the activityId in order to prevent displaying
// use the campaignId and the activityId in order to prevent displaying
// duplicate notifications from a campaign activity.
if (DIRECT_CAMPAIGN_SEND.equals(campaignId) && activityId == null) {
return random.nextInt();
Expand All @@ -694,18 +712,23 @@ int getNotificationRequestId(final String campaignId,
}
}

private boolean displayNotification(final Bundle pushBundle, final Class<?> targetClass, final String imageUrl,
final String iconImageUrl, final String iconSmallImageUrl,
final Map<String, String> campaignAttributes, final String intentAction) {
log.info("Display Notification: " + pushBundle.toString());

final int iconResId = getNotificationIconResourceId(pushBundle.getString(NOTIFICATION_ICON_PUSH_KEY));
private boolean displayNotification(
final Bundle data,
final Class<?> intentReceiver,
final String imageUrl,
final String iconImageUrl,
final String iconSmallImageUrl,
final Map<String, String> campaignAttributes,
final String intentAction) {
log.info("Display Notification: " + data.toString());

final int iconResId = getNotificationIconResourceId(data.getString(NOTIFICATION_ICON_PUSH_KEY));
if (iconResId == 0) {
return false;
}

final String title = pushBundle.getString(NOTIFICATION_TITLE_PUSH_KEY);
final String message = pushBundle.getString(NOTIFICATION_BODY_PUSH_KEY);
final String title = data.getString(NOTIFICATION_TITLE_PUSH_KEY);
final String message = data.getString(NOTIFICATION_BODY_PUSH_KEY);

final String campaignId = campaignAttributes.get(CAMPAIGN_ID_ATTRIBUTE_KEY);
final String activityId = campaignAttributes.get(CAMPAIGN_ACTIVITY_ID_ATTRIBUTE_KEY);
Expand All @@ -718,19 +741,23 @@ private boolean displayNotification(final Bundle pushBundle, final Class<?> targ
new Thread(new Runnable() {
@Override
public void run() {
final Notification notification = createNotification(iconResId, title, message, imageUrl, iconImageUrl,
iconSmallImageUrl,
NotificationClientBase.this.createOpenAppPendingIntent(pushBundle, targetClass,
campaignId, requestID,
intentAction));
final Notification notification = createNotification(
iconResId,
title,
message,
imageUrl,
iconImageUrl,
iconSmallImageUrl,
NotificationClientBase.this.createOpenAppPendingIntent(
data, intentReceiver, campaignId, requestID, intentAction));

notification.flags |= Notification.FLAG_AUTO_CANCEL;
notification.defaults |= Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE;

if (android.os.Build.VERSION.SDK_INT >= ANDROID_LOLLIPOP) {
log.info("SDK greater than 21 detected: " + android.os.Build.VERSION.SDK_INT);

final String colorString = pushBundle.getString(NOTIFICATION_COLOR_PUSH_KEY);
final String colorString = data.getString(NOTIFICATION_COLOR_PUSH_KEY);
if (colorString != null) {
int color;
try {
Expand All @@ -750,14 +777,15 @@ public void run() {
exception = ex;
}
if (exception != null) {
log.error("Couldn't set campaign notification color : " + exception.getMessage(), exception);
log.error("Couldn't set campaign notification color : " +
exception.getMessage(), exception);
}
}
}

final NotificationManager notificationManager = (NotificationManager) pinpointContext.getApplicationContext()
.getSystemService(
Context.NOTIFICATION_SERVICE);
final NotificationManager notificationManager =
(NotificationManager) pinpointContext.getApplicationContext()
.getSystemService(Context.NOTIFICATION_SERVICE);

notificationManager.notify(requestID, notification);
}
Expand All @@ -767,9 +795,9 @@ public void run() {
}

private boolean openApp() {
final Intent launchIntent = pinpointContext.getApplicationContext().getPackageManager()
.getLaunchIntentForPackage(
pinpointContext.getApplicationContext().getPackageName());
final Intent launchIntent =
pinpointContext.getApplicationContext().getPackageManager()
.getLaunchIntentForPackage(pinpointContext.getApplicationContext().getPackageName());

if (launchIntent == null) {
log.error("Couldn't get app launch intent for campaign notification.");
Expand Down Expand Up @@ -845,7 +873,7 @@ NotificationClient.CampaignPushResult handleNotificationOpen(
public final NotificationClient.CampaignPushResult handleCampaignPush(NotificationDetails notificationDetails) {
final String from = notificationDetails.getFrom();
final Bundle data = notificationDetails.getBundle();
final Class<?> targetClass = notificationDetails.getTargetClass();
final Class<?> intentReceiver = notificationDetails.getTargetClass();
String intentAction = notificationDetails.getIntentAction();
notificationChannelId = notificationDetails.getNotificationChannelId();

Expand Down Expand Up @@ -901,7 +929,7 @@ public final NotificationClient.CampaignPushResult handleCampaignPush(Notificati
// App is in the background; attempt to display a
// notification in the notification center.
if (!areAppNotificationsEnabled() ||
!displayNotification(data, targetClass, imageUrl, imageIconUrl, imageSmallIconUrl, campaignAttributes,
!displayNotification(data, intentReceiver, imageUrl, imageIconUrl, imageSmallIconUrl, campaignAttributes,
intentAction)) {
// Local app notifications have been disabled by the
// user from Settings -> App Info
Expand Down