Skip to content

Add ServiceWorkerLifecycleObserver to BrowserActivity lifecycle instead of Application #2131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Add ServiceWorkerLifecycleObserver to BrowserActivity lifecycle instead of Application #2131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import com.duckduckgo.app.browser.databinding.IncludeOmnibarToolbarMockupBinding
import com.duckduckgo.app.browser.rating.ui.AppEnjoymentDialogFragment
import com.duckduckgo.app.browser.rating.ui.GiveFeedbackDialogFragment
import com.duckduckgo.app.browser.rating.ui.RateAppDialogFragment
import com.duckduckgo.app.browser.serviceworker.ServiceWorkerLifecycleObserver
import com.duckduckgo.app.browser.shortcut.ShortcutBuilder
import com.duckduckgo.app.cta.ui.CtaViewModel
import com.duckduckgo.app.di.AppCoroutineScope
Expand Down Expand Up @@ -107,6 +108,9 @@ open class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope()
@Inject
lateinit var userEventsStore: UserEventsStore

@Inject
lateinit var serviceWorkerLifecycleObserver: ServiceWorkerLifecycleObserver

@Inject
@AppCoroutineScope
lateinit var appCoroutineScope: CoroutineScope
Expand Down Expand Up @@ -141,6 +145,7 @@ open class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope()
instanceStateBundles = CombinedInstanceState(originalInstanceState = savedInstanceState, newInstanceState = newInstanceState)

super.onCreate(savedInstanceState = newInstanceState, daggerInject = false)
lifecycle.addObserver(serviceWorkerLifecycleObserver)
toolbarMockupBinding = IncludeOmnibarToolbarMockupBinding.bind(binding.root)
setContentView(binding.root)
viewModel.viewState.observe(this) {
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/java/com/duckduckgo/app/browser/serviceworker/ServiceWorkerLifecycleObserver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,15 @@ import androidx.webkit.WebViewFeature
import androidx.webkit.WebViewFeature.SERVICE_WORKER_BASIC_USAGE
import com.duckduckgo.app.browser.RequestInterceptor
import com.duckduckgo.app.global.exception.UncaughtExceptionRepository
import com.duckduckgo.di.scopes.AppScope
import timber.log.Timber
import javax.inject.Inject
import dagger.SingleInstanceIn

@SingleInstanceIn(AppScope::class)
class ServiceWorkerLifecycleObserver @Inject constructor(
private val requestInterceptor: RequestInterceptor,
private val uncaughtExceptionRepository: UncaughtExceptionRepository,
) : DefaultLifecycleObserver {
override fun onStart(owner: LifecycleOwner) {
super.onStart(owner)
override fun onCreate(owner: LifecycleOwner) {
super.onCreate(owner)

if (WebViewFeature.isFeatureSupported(SERVICE_WORKER_BASIC_USAGE)) {
try {
Expand Down