From aa573ab9aac24c93fe74216a379b0e0f07a2f70e Mon Sep 17 00:00:00 2001 From: brave-builds Date: Mon, 1 Nov 2021 21:22:41 +0000 Subject: [PATCH] Uplift of #10802 (squashed) to release --- .../browser/notifications/BraveOnboardingNotification.java | 7 ++----- .../BraveSetDefaultBrowserNotificationService.java | 4 ++-- .../chrome/browser/upgrade/NotificationIntent.java | 4 +++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java b/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java index 9c446b0085d8..3eb7b117563e 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java @@ -84,11 +84,8 @@ public static void showOnboardingNotification() { public static PendingIntentProvider getDeepLinkIntent(Context context) { Intent intent = new Intent(context, BraveOnboardingNotification.class); intent.setAction(DEEP_LINK); - return new PendingIntentProvider( - PendingIntent.getBroadcast(context, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT - | IntentUtils.getPendingIntentMutabilityFlag(true)), - 0, 0); + return PendingIntentProvider.getBroadcast( + context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT, true); } @Override diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java index 902104b000d4..f1dd5c530b0f 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java @@ -150,8 +150,8 @@ public static PendingIntent getDismissIntent(Context context, int notification_i intent.setAction(CANCEL_NOTIFICATION); intent.putExtra(NOTIFICATION_ID_EXTRA, notification_id); - return PendingIntent.getBroadcast(context, notification_id, intent, - 0 | IntentUtils.getPendingIntentMutabilityFlag(true)); + return PendingIntent.getBroadcast( + context, notification_id, intent, IntentUtils.getPendingIntentMutabilityFlag(true)); } private boolean hasAskedAt1122() { diff --git a/android/java/org/chromium/chrome/browser/upgrade/NotificationIntent.java b/android/java/org/chromium/chrome/browser/upgrade/NotificationIntent.java index ad13b2cf3321..3448a7168270 100644 --- a/android/java/org/chromium/chrome/browser/upgrade/NotificationIntent.java +++ b/android/java/org/chromium/chrome/browser/upgrade/NotificationIntent.java @@ -17,6 +17,7 @@ import androidx.core.app.NotificationCompat; +import org.chromium.base.IntentUtils; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.chrome.R; @@ -63,7 +64,8 @@ public static void fireNotificationIfNecessary(Context context) { Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(URL)); intent.putExtra(BravePreferenceKeys.BRAVE_UPDATE_EXTRA_PARAM, true); intent.setPackage(context.getPackageName()); - PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); + PendingIntent pendingIntent = PendingIntent.getActivity( + context, 0, intent, IntentUtils.getPendingIntentMutabilityFlag(true)); mBuilder.setContentIntent(pendingIntent); mBuilder.setAutoCancel(true);