diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt index 7d5d2e87..a19831f7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt @@ -11,11 +11,11 @@ import androidx.annotation.RequiresApi import androidx.core.os.bundleOf import com.moez.QKSMS.R import com.moez.QKSMS.feature.compose.ComposeActivity +import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.model.Conversation import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.util.GlideApp import com.moez.QKSMS.util.tryOrNull -import dagger.android.AndroidInjection import javax.inject.Inject @RequiresApi(Build.VERSION_CODES.M) @@ -24,7 +24,7 @@ class QkChooserTargetService : ChooserTargetService() { @Inject lateinit var conversationRepo: ConversationRepository override fun onCreate() { - AndroidInjection.inject(this) + appComponent.inject(this) super.onCreate() } diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index 177e80a5..e91d5ed7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -20,6 +20,7 @@ package com.moez.QKSMS.injection import com.moez.QKSMS.common.QKApplication import com.moez.QKSMS.common.QkDialog +import com.moez.QKSMS.common.util.QkChooserTargetService import com.moez.QKSMS.common.widget.AvatarView import com.moez.QKSMS.common.widget.PagerTitleView import com.moez.QKSMS.common.widget.PreferenceView @@ -67,6 +68,11 @@ interface AppComponent { fun inject(service: WidgetAdapter) + /** + * This can't use AndroidInjection, or else it will crash on pre-marshmallow devices + */ + fun inject(service: QkChooserTargetService) + fun inject(view: AvatarView) fun inject(view: DetailedChipView) fun inject(view: PagerTitleView) diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt index 69df3e80..c14aa210 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt @@ -18,7 +18,6 @@ */ package com.moez.QKSMS.injection.android -import com.moez.QKSMS.common.util.QkChooserTargetService import com.moez.QKSMS.feature.backup.RestoreBackupService import com.moez.QKSMS.injection.scope.ActivityScope import com.moez.QKSMS.service.HeadlessSmsSendService @@ -34,10 +33,6 @@ abstract class ServiceBuilderModule { @ContributesAndroidInjector() abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService - @ActivityScope - @ContributesAndroidInjector() - abstract fun bindQkChooserTargetService(): QkChooserTargetService - @ActivityScope @ContributesAndroidInjector() abstract fun bindRestoreBackupService(): RestoreBackupService