forked from upstream-mirrors/quik
Fix launch crash on pre-marshmallow devices
This commit is contained in:
@@ -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()
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user