From 4ce0b26babf04a14c05b786f4bee8c851e745798 Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Tue, 21 Feb 2023 11:46:59 -0500 Subject: [PATCH] Bug 1817432 - Always setup notification workers even if marketing channel has not been created (cherry picked from commit 9aecd047d2b03973e4fa15abe0ada48901895250) --- .../main/java/org/mozilla/fenix/HomeActivity.kt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 574970ca6a..7b332f6039 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -90,7 +90,6 @@ import org.mozilla.fenix.ext.areNotificationsEnabledSafe import org.mozilla.fenix.ext.breadcrumb import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.hasTopDestination -import org.mozilla.fenix.ext.isNotificationChannelEnabled import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.setNavigationIcon import org.mozilla.fenix.ext.settings @@ -112,7 +111,6 @@ import org.mozilla.fenix.library.recentlyclosed.RecentlyClosedFragmentDirections import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.onboarding.DefaultBrowserNotificationWorker import org.mozilla.fenix.onboarding.FenixOnboarding -import org.mozilla.fenix.onboarding.MARKETING_CHANNEL_ID import org.mozilla.fenix.onboarding.ReEngagementNotificationWorker import org.mozilla.fenix.onboarding.ensureMarketingChannelExists import org.mozilla.fenix.perf.MarkersActivityLifecycleCallbacks @@ -431,15 +429,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { // that we should not rely on the application being killed between user sessions. components.appStore.dispatch(AppAction.ResumedMetricsAction) - with(applicationContext) { - // Only set up Workers if notifications are enabled - val notificationManagerCompat = NotificationManagerCompat.from(this) - if (notificationManagerCompat.isNotificationChannelEnabled(MARKETING_CHANNEL_ID)) { - DefaultBrowserNotificationWorker.setDefaultBrowserNotificationIfNeeded(this) - ReEngagementNotificationWorker.setReEngagementNotificationIfNeeded(this) - MessageNotificationWorker.setMessageNotificationWorker(this) - } - } + DefaultBrowserNotificationWorker.setDefaultBrowserNotificationIfNeeded(applicationContext) + ReEngagementNotificationWorker.setReEngagementNotificationIfNeeded(applicationContext) + MessageNotificationWorker.setMessageNotificationWorker(applicationContext) } // This was done in order to refresh search engines when app is running in background