From 80da5d012d7aedea865015741d51ce3a7c852b98 Mon Sep 17 00:00:00 2001 From: deeppandya Date: Mon, 23 Jan 2023 13:51:15 -0500 Subject: [PATCH] Update the feature condtions Checking for feature t=before the permission --- .../notifications/BraveNotificationWarningDialog.java | 8 ++++---- .../browser/notifications/BravePermissionUtils.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationWarningDialog.java b/android/java/org/chromium/chrome/browser/notifications/BraveNotificationWarningDialog.java index 39b1bfa2136..7479a883b04 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationWarningDialog.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveNotificationWarningDialog.java @@ -91,13 +91,13 @@ public class BraveNotificationWarningDialog extends BraveDialogFragment { } public static boolean shouldShowRewardWarningDialog(Context context) { - return BravePermissionUtils.isBraveAdsNotificationPermissionBlocked(context) - && isBraveRewardsEnabled(); + return isBraveRewardsEnabled() + && BravePermissionUtils.isBraveAdsNotificationPermissionBlocked(context); } public static boolean shouldShowPrivacyWarningDialog(Context context) { - return BravePermissionUtils.isGeneralNotificationPermissionBlocked(context) - && isPrivacyReportsEnabled(); + return isPrivacyReportsEnabled() + && BravePermissionUtils.isGeneralNotificationPermissionBlocked(context); } private static boolean shouldShowBothWarningDialog(Context context) { diff --git a/android/java/org/chromium/chrome/browser/notifications/BravePermissionUtils.java b/android/java/org/chromium/chrome/browser/notifications/BravePermissionUtils.java index 5a179ff8e8e..22ce0bb74a3 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BravePermissionUtils.java +++ b/android/java/org/chromium/chrome/browser/notifications/BravePermissionUtils.java @@ -62,7 +62,7 @@ public class BravePermissionUtils { (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); NotificationChannelGroup notificationChannelGroup = notificationManager.getNotificationChannelGroup(channelGroupName); - return notificationChannelGroup.isBlocked(); + return notificationChannelGroup != null ? notificationChannelGroup.isBlocked() : false; } else { return NotificationManagerCompat.from(context).areNotificationsEnabled(); }