Fix rebase onto develop

duckduckgo · Dec 3, 2021 · 541e259 · 541e259
1 parent b1c848f
commit 541e259
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/state/BrowserApplicationStateInfo.kt b/app/src/main/java/com/duckduckgo/app/browser/state/BrowserApplicationStateInfo.kt
@@ -21,13 +21,13 @@ import android.os.Bundle
 import com.duckduckgo.app.browser.BrowserActivity
 import com.duckduckgo.app.global.ActivityLifecycleCallbacks
 import com.duckduckgo.browser.api.BrowserLifecycleObserver
-import com.duckduckgo.di.scopes.AppObjectGraph
+import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesMultibinding
+import dagger.SingleInstanceIn
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@ContributesMultibinding(AppObjectGraph::class)
-@Singleton
+@ContributesMultibinding(AppScope::class)
+@SingleInstanceIn(AppScope::class)
 class BrowserApplicationStateInfo @Inject constructor(
     private val observers: Set<@JvmSuppressWildcards BrowserLifecycleObserver>
 ) : ActivityLifecycleCallbacks {

diff --git a/app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt b/app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt
@@ -32,14 +32,14 @@ import com.duckduckgo.app.settings.clear.ClearWhatOption
 import com.duckduckgo.app.settings.clear.ClearWhenOption
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.browser.api.BrowserLifecycleObserver
-import com.duckduckgo.di.scopes.AppObjectGraph
+import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
 import com.squareup.anvil.annotations.ContributesMultibinding
+import dagger.SingleInstanceIn
 import kotlinx.coroutines.*
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
-import javax.inject.Singleton
 import kotlin.coroutines.CoroutineContext
 
 interface DataClearer {
@@ -48,14 +48,14 @@ interface DataClearer {
 }
 
 @ContributesBinding(
-    scope = AppObjectGraph::class,
+    scope = AppScope::class,
     boundType = DataClearer::class
 )
 @ContributesMultibinding(
-    scope = AppObjectGraph::class,
+    scope = AppScope::class,
     boundType = BrowserLifecycleObserver::class
 )
-@Singleton
+@SingleInstanceIn(AppScope::class)
 class AutomaticDataClearer @Inject constructor(
     private val workManager: WorkManager,
     private val settingsDataStore: SettingsDataStore,

diff --git a/app/src/main/java/com/duckduckgo/app/global/ActivityLifecycleCallbacks.kt b/app/src/main/java/com/duckduckgo/app/global/ActivityLifecycleCallbacks.kt
@@ -20,11 +20,11 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import com.duckduckgo.app.global.plugins.PluginPoint
-import com.duckduckgo.di.scopes.AppObjectGraph
+import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
-import javax.inject.Singleton
+import dagger.SingleInstanceIn
 
 interface ActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
@@ -51,10 +51,10 @@ private class ActivityLifecycleCallbacksPluginPoint(
 }
 
 @Module
-@ContributesTo(AppObjectGraph::class)
+@ContributesTo(AppScope::class)
 class ActivityLifecycleCallbacksModule {
     @Provides
-    @Singleton
+    @SingleInstanceIn(AppScope::class)
     fun provideActivityLifecycleCallbacksPluginPoint(
         plugins: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>
     ): PluginPoint<ActivityLifecycleCallbacks> = ActivityLifecycleCallbacksPluginPoint(plugins)

diff --git a/...cy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/di/PrivacyConfigModule.kt b/...cy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/di/PrivacyConfigModule.kt
@@ -162,7 +162,7 @@ class DatabaseModule {
         return RealPrivacyFeatureTogglesRepository(privacyFeatureTogglesDataStore)
     }
 
-    @Singleton
+    @SingleInstanceIn(AppScope::class)
     @Provides
     fun provideDrmRepository(database: PrivacyConfigDatabase, @AppCoroutineScope coroutineScope: CoroutineScope, dispatcherProvider: DispatcherProvider): DrmRepository {
         return RealDrmRepository(database, coroutineScope, dispatcherProvider)

diff --git a/...vacy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/features/drm/RealDrm.kt b/...vacy-config-impl/src/main/java/com/duckduckgo/privacy/config/impl/features/drm/RealDrm.kt
@@ -20,17 +20,17 @@ import android.net.Uri
 import android.webkit.PermissionRequest
 import androidx.core.net.toUri
 import com.duckduckgo.app.global.baseHost
-import com.duckduckgo.di.scopes.AppObjectGraph
+import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.feature.toggles.api.FeatureToggle
 import com.duckduckgo.privacy.config.api.Drm
 import com.duckduckgo.privacy.config.api.PrivacyFeatureName
 import com.duckduckgo.privacy.config.store.features.drm.DrmRepository
 import com.squareup.anvil.annotations.ContributesBinding
+import dagger.SingleInstanceIn
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@ContributesBinding(AppObjectGraph::class)
-@Singleton
+@ContributesBinding(AppScope::class)
+@SingleInstanceIn(AppScope::class)
 class RealDrm @Inject constructor(private val featureToggle: FeatureToggle, private val drmRepository: DrmRepository) : Drm {
 
     override fun getDrmPermissionsForRequest(url: String, resources: Array<String>): Array<String> {