Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-crash-android5'

This commit is contained in:
Conny Duck 2019-02-22 17:10:12 +01:00
parent 8e98f872d5 72d15f341d
commit ba61387909
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/keylesspalace/tusky/di/ServicesModule.kt
View File

@ -15,7 +15,6 @@
package com.keylesspalace.tusky.di package com.keylesspalace.tusky.di
import com.keylesspalace.tusky.service.AccountChooserService
import com.keylesspalace.tusky.service.SendTootService import com.keylesspalace.tusky.service.SendTootService
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
@ -24,6 +23,4 @@ import dagger.android.ContributesAndroidInjector
abstract class ServicesModule { abstract class ServicesModule {
@ContributesAndroidInjector @ContributesAndroidInjector
abstract fun contributesSendTootService(): SendTootService abstract fun contributesSendTootService(): SendTootService
@ContributesAndroidInjector
abstract fun contributesAccountChooserService(): AccountChooserService
} }

9
app/src/main/java/com/keylesspalace/tusky/service/AccountChooserService.kt
View File

@ -24,21 +24,22 @@ import android.service.chooser.ChooserTarget
import android.service.chooser.ChooserTargetService import android.service.chooser.ChooserTargetService
import android.text.TextUtils import android.text.TextUtils
import com.keylesspalace.tusky.R import com.keylesspalace.tusky.R
import com.keylesspalace.tusky.TuskyApplication
import com.keylesspalace.tusky.db.AccountManager import com.keylesspalace.tusky.db.AccountManager
import com.keylesspalace.tusky.di.Injectable import com.keylesspalace.tusky.di.Injectable
import com.keylesspalace.tusky.util.NotificationHelper import com.keylesspalace.tusky.util.NotificationHelper
import com.squareup.picasso.Picasso import com.squareup.picasso.Picasso
import dagger.android.AndroidInjection
import javax.inject.Inject
@TargetApi(23) @TargetApi(23)
class AccountChooserService : ChooserTargetService(), Injectable { class AccountChooserService : ChooserTargetService(), Injectable {
@Inject
// cannot inject here, it crashes on APIs < 23
lateinit var accountManager: AccountManager lateinit var accountManager: AccountManager
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
AndroidInjection.inject(this) accountManager = (application as TuskyApplication).serviceLocator.get(AccountManager::class.java)
} }
override fun onGetChooserTargets(targetActivityName: ComponentName?, intentFilter: IntentFilter?): MutableList<ChooserTarget> { override fun onGetChooserTargets(targetActivityName: ComponentName?, intentFilter: IntentFilter?): MutableList<ChooserTarget> {