Fix user earns while native Windows and macOS notifications are suppressed

components/brave_ads/browser/BUILD.gn

@@ -68,7 +68,7 @@ source_set("browser") {
       "notification_helper_android.h",
       "notification_helper_linux.cc",
       "notification_helper_linux.h",
-      "notification_helper_mac.cc",
+      "notification_helper_mac.mm",
       "notification_helper_mac.h",
       "notification_helper_win.cc",
       "notification_helper_win.h",
@@ -88,6 +88,12 @@ source_set("browser") {
       "//ui/message_center/public/cpp",
     ]
 
+    if (is_mac) {
+      libs = [
+        "UserNotifications.framework",
+      ]
+    }
+
     if (is_win) {
       deps += [
         "//ui/views",

components/brave_ads/browser/ads_service_impl.cc

@@ -37,6 +37,7 @@
 #include "brave/components/brave_rewards/common/pref_names.h"
 #include "brave/components/services/bat_ads/public/cpp/ads_client_mojo_bridge.h"
 #include "brave/components/services/bat_ads/public/interfaces/bat_ads.mojom.h"
+#include "brave/components/brave_ads/browser/notification_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_display_service.h"
 #include "chrome/browser/notifications/notification_display_service_impl.h"
@@ -1922,7 +1923,7 @@ void AdsServiceImpl::ShowNotification(
 #endif
 }
 
-bool AdsServiceImpl::ShouldShowNotifications() const {
+bool AdsServiceImpl::ShouldShowNotifications() {
   return NotificationHelper::GetInstance()->ShouldShowNotifications();
 }
 

components/brave_ads/browser/ads_service_impl.h

@@ -359,7 +359,7 @@ class AdsServiceImpl : public AdsService,
 
   void ShowNotification(
       std::unique_ptr<ads::NotificationInfo> info) override;
-  bool ShouldShowNotifications() const override;
+  bool ShouldShowNotifications() override;
   void CloseNotification(
       const std::string& id) override;
 

components/brave_ads/browser/notification_helper.cc

@@ -7,25 +7,40 @@
 
 namespace brave_ads {
 
+NotificationHelper* g_notification_helper_for_testing = nullptr;
+
 NotificationHelper::NotificationHelper() = default;
 
 NotificationHelper::~NotificationHelper() = default;
 
-bool NotificationHelper::ShouldShowNotifications() const {
+void NotificationHelper::set_for_testing(
+    NotificationHelper* notification_helper) {
+  g_notification_helper_for_testing = notification_helper;
+}
+
+bool NotificationHelper::ShouldShowNotifications() {
   return true;
 }
 
-bool NotificationHelper::ShowMyFirstAdNotification() const {
+bool NotificationHelper::ShowMyFirstAdNotification() {
   return false;
 }
 
 bool NotificationHelper::CanShowBackgroundNotifications() const {
   return true;
 }
 
-#if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_ANDROID)  // NOLINT
 NotificationHelper* NotificationHelper::GetInstance() {
-  // just return a dummy notification helper for all other platforms
+  if (g_notification_helper_for_testing) {
+    return g_notification_helper_for_testing;
+  }
+
+  return GetInstanceImpl();
+}
+
+#if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_ANDROID)  // NOLINT
+NotificationHelper* NotificationHelper::GetInstanceImpl() {
+  // Return a default notification helper for unsupported platforms
   return base::Singleton<NotificationHelper>::get();
 }
 #endif

components/brave_ads/browser/notification_helper.h

@@ -6,8 +6,6 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_NOTIFICATION_HELPER_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_NOTIFICATION_HELPER_H_
 
-#include <string>
-
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
@@ -18,16 +16,21 @@ class NotificationHelper {
  public:
   static NotificationHelper* GetInstance();
 
-  virtual bool ShouldShowNotifications() const;
+  void set_for_testing(
+      NotificationHelper* notification_helper);
+
+  virtual bool ShouldShowNotifications();
 
-  virtual bool ShowMyFirstAdNotification() const;
+  virtual bool ShowMyFirstAdNotification();
 
   virtual bool CanShowBackgroundNotifications() const;
 
  protected:
   NotificationHelper();
   virtual ~NotificationHelper();
 
+  static NotificationHelper* GetInstanceImpl();
+
  private:
   friend struct base::DefaultSingletonTraits<NotificationHelper>;
   DISALLOW_COPY_AND_ASSIGN(NotificationHelper);

components/brave_ads/browser/notification_helper_android.cc

@@ -28,7 +28,7 @@ NotificationHelperAndroid::NotificationHelperAndroid() = default;
 
 NotificationHelperAndroid::~NotificationHelperAndroid() = default;
 
-bool NotificationHelperAndroid::ShouldShowNotifications() const {
+bool NotificationHelperAndroid::ShouldShowNotifications() {
   JNIEnv* env = base::android::AttachCurrentThread();
   int status = Java_NotificationSystemStatusUtil_getAppNotificationStatus(env);
   bool is_notifications_enabled = (status == kAppNotificationsStatusEnabled ||
@@ -40,12 +40,11 @@ bool NotificationHelperAndroid::ShouldShowNotifications() const {
   auto should_show_notifications =
       CanShowBackgroundNotifications() || is_foreground;
 
-  return is_notifications_enabled &&
-         is_notification_channel_enabled &&
-         should_show_notifications;
+  return is_notifications_enabled && is_notification_channel_enabled &&
+      should_show_notifications;
 }
 
-bool NotificationHelperAndroid::ShowMyFirstAdNotification() const {
+bool NotificationHelperAndroid::ShowMyFirstAdNotification() {
   if (!ShouldShowNotifications()) {
     return false;
   }
@@ -61,6 +60,16 @@ bool NotificationHelperAndroid::CanShowBackgroundNotifications() const {
   return Java_BraveAdsSignupDialog_showAdsInBackground(env);
 }
 
+NotificationHelperAndroid* NotificationHelperAndroid::GetInstanceImpl() {
+  return base::Singleton<NotificationHelperAndroid>::get();
+}
+
+NotificationHelper* NotificationHelper::GetInstanceImpl() {
+  return NotificationHelperAndroid::GetInstanceImpl();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 bool NotificationHelperAndroid::IsBraveAdsNotificationChannelEnabled() const {
   if (GetOperatingSystemVersion() < kMinimumVersionForNotificationChannels) {
     return true;
@@ -86,12 +95,4 @@ int NotificationHelperAndroid::GetOperatingSystemVersion() const {
   return major_version;
 }
 
-NotificationHelperAndroid* NotificationHelperAndroid::GetInstance() {
-  return base::Singleton<NotificationHelperAndroid>::get();
-}
-
-NotificationHelper* NotificationHelper::GetInstance() {
-  return NotificationHelperAndroid::GetInstance();
-}
-
 }  // namespace brave_ads

components/brave_ads/browser/notification_helper_android.h

@@ -8,25 +8,23 @@
 
 #include <memory>
 
-#include "base/macros.h"
-#include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 
 #include "brave/components/brave_ads/browser/notification_helper.h"
 #include "chrome/browser/notifications/notification_channels_provider_android.h"
 
 namespace brave_ads {
 
-class NotificationHelperAndroid :
-    public NotificationHelper,
-    public base::SupportsWeakPtr<NotificationHelperAndroid> {
+class NotificationHelperAndroid
+    : public NotificationHelper,
+      public base::SupportsWeakPtr<NotificationHelperAndroid> {
  public:
+  static NotificationHelperAndroid* GetInstanceImpl();
+
+ private:
   NotificationHelperAndroid();
   ~NotificationHelperAndroid() override;
 
-  static NotificationHelperAndroid* GetInstance();
-
- private:
   bool IsBraveAdsNotificationChannelEnabled() const;
 
   std::unique_ptr<NotificationChannelsProviderAndroid> channels_provider_ =
@@ -35,9 +33,9 @@ class NotificationHelperAndroid :
   int GetOperatingSystemVersion() const;
 
   // NotificationHelper impl
-  bool ShouldShowNotifications() const override;
+  bool ShouldShowNotifications() override;
 
-  bool ShowMyFirstAdNotification() const override;
+  bool ShowMyFirstAdNotification() override;
 
   bool CanShowBackgroundNotifications() const override;
 

components/brave_ads/browser/notification_helper_linux.cc

@@ -4,7 +4,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "brave/components/brave_ads/browser/notification_helper_linux.h"
-
 #include "chrome/browser/fullscreen.h"
 
 namespace brave_ads {
@@ -13,24 +12,33 @@ NotificationHelperLinux::NotificationHelperLinux() = default;
 
 NotificationHelperLinux::~NotificationHelperLinux() = default;
 
-bool NotificationHelperLinux::ShouldShowNotifications() const {
-  return !IsFullScreenMode();
+bool NotificationHelperLinux::ShouldShowNotifications() {
+  if (IsFullScreenMode()) {
+    LOG(WARNING) << "Notification not made: Full screen mode";
+    return false;
+  }
+
+  // TODO(https://github.com/brave/brave-browser/issues/5542): Investigate how
+  // we can detect if notifications are enabled within the Linux operating
+  // system
+
+  return true;
 }
 
-bool NotificationHelperLinux::ShowMyFirstAdNotification() const {
+bool NotificationHelperLinux::ShowMyFirstAdNotification() {
   return false;
 }
 
 bool NotificationHelperLinux::CanShowBackgroundNotifications() const {
   return true;
 }
 
-NotificationHelperLinux* NotificationHelperLinux::GetInstance() {
+NotificationHelperLinux* NotificationHelperLinux::GetInstanceImpl() {
   return base::Singleton<NotificationHelperLinux>::get();
 }
 
-NotificationHelper* NotificationHelper::GetInstance() {
-  return NotificationHelperLinux::GetInstance();
+NotificationHelper* NotificationHelper::GetInstanceImpl() {
+  return NotificationHelperLinux::GetInstanceImpl();
 }
 
 }  // namespace brave_ads

components/brave_ads/browser/notification_helper_linux.h

@@ -6,28 +6,26 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_NOTIFICATION_HELPER_LINUX_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_NOTIFICATION_HELPER_LINUX_H_
 
-#include "base/macros.h"
-#include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 
 #include "brave/components/brave_ads/browser/notification_helper.h"
 
 namespace brave_ads {
 
-class NotificationHelperLinux :
-    public NotificationHelper,
-    public base::SupportsWeakPtr<NotificationHelperLinux> {
+class NotificationHelperLinux
+    : public NotificationHelper,
+      public base::SupportsWeakPtr<NotificationHelperLinux> {
  public:
+  static NotificationHelperLinux* GetInstanceImpl();
+
+ private:
   NotificationHelperLinux();
   ~NotificationHelperLinux() override;
 
-  static NotificationHelperLinux* GetInstance();
-
- private:
   // NotificationHelper impl
-  bool ShouldShowNotifications() const override;
+  bool ShouldShowNotifications() override;
 
-  bool ShowMyFirstAdNotification() const override;
+  bool ShowMyFirstAdNotification() override;
 
   bool CanShowBackgroundNotifications() const override;
 

components/brave_ads/browser/notification_helper_mac.h

@@ -6,28 +6,28 @@
 #ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_NOTIFICATION_HELPER_MAC_H_
 #define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_NOTIFICATION_HELPER_MAC_H_
 
-#include "base/macros.h"
-#include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 
 #include "brave/components/brave_ads/browser/notification_helper.h"
 
 namespace brave_ads {
 
-class NotificationHelperMac :
-    public NotificationHelper,
-    public base::SupportsWeakPtr<NotificationHelperMac> {
+class NotificationHelperMac
+    : public NotificationHelper,
+      public base::SupportsWeakPtr<NotificationHelperMac> {
  public:
+  static NotificationHelperMac* GetInstanceImpl();
+
+ private:
   NotificationHelperMac();
   ~NotificationHelperMac() override;
 
-  static NotificationHelperMac* GetInstance();
+  bool IsNotificationsEnabled() const;
 
- private:
   // NotificationHelper impl
-  bool ShouldShowNotifications() const override;
+  bool ShouldShowNotifications() override;
 
-  bool ShowMyFirstAdNotification() const override;
+  bool ShowMyFirstAdNotification() override;
 
   bool CanShowBackgroundNotifications() const override;