Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

Bug 1817432 - Always setup notification workers even if marketing channel has not been created

Browse Source 
(cherry picked from commit 9aecd047d2b03973e4fa15abe0ada48901895250)
This commit is contained in:
Roger Yang 2023-02-21 11:46:59 -05:00 committed by mergify[bot]
parent 4ca35c6cd0
commit 4ce0b26bab
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -90,7 +90,6 @@ import org.mozilla.fenix.ext.areNotificationsEnabledSafe
import org.mozilla.fenix.ext.breadcrumb import org.mozilla.fenix.ext.breadcrumb
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.hasTopDestination import org.mozilla.fenix.ext.hasTopDestination
import org.mozilla.fenix.ext.isNotificationChannelEnabled
import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.ext.setNavigationIcon import org.mozilla.fenix.ext.setNavigationIcon
import org.mozilla.fenix.ext.settings 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.nimbus.FxNimbus
import org.mozilla.fenix.onboarding.DefaultBrowserNotificationWorker import org.mozilla.fenix.onboarding.DefaultBrowserNotificationWorker
import org.mozilla.fenix.onboarding.FenixOnboarding 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.ReEngagementNotificationWorker
import org.mozilla.fenix.onboarding.ensureMarketingChannelExists import org.mozilla.fenix.onboarding.ensureMarketingChannelExists
import org.mozilla.fenix.perf.MarkersActivityLifecycleCallbacks 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. // that we should not rely on the application being killed between user sessions.
components.appStore.dispatch(AppAction.ResumedMetricsAction) components.appStore.dispatch(AppAction.ResumedMetricsAction)
with(applicationContext) { DefaultBrowserNotificationWorker.setDefaultBrowserNotificationIfNeeded(applicationContext)
// Only set up Workers if notifications are enabled ReEngagementNotificationWorker.setReEngagementNotificationIfNeeded(applicationContext)
val notificationManagerCompat = NotificationManagerCompat.from(this) MessageNotificationWorker.setMessageNotificationWorker(applicationContext)
if (notificationManagerCompat.isNotificationChannelEnabled(MARKETING_CHANNEL_ID)) {
DefaultBrowserNotificationWorker.setDefaultBrowserNotificationIfNeeded(this)
ReEngagementNotificationWorker.setReEngagementNotificationIfNeeded(this)
MessageNotificationWorker.setMessageNotificationWorker(this)
}
}
} }
// This was done in order to refresh search engines when app is running in background // This was done in order to refresh search engines when app is running in background