mirror of
https://github.com/thunderbird/thunderbird-android.git
synced 2024-09-20 12:12:15 +02:00
Upgrade AndroidX lifecycle libraries to 2.3.1
This commit is contained in:
parent
84a4589702
commit
65d3df63b0
@ -2,12 +2,7 @@ package com.fsck.k9.ui
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.Observer
|
||||
|
||||
fun <T> LiveData<T>.observeNotNull(owner: LifecycleOwner, observer: (T) -> Unit) {
|
||||
this.observe(owner, Observer<T> { observer(it!!) })
|
||||
}
|
||||
|
||||
fun <T> LiveData<T>.observe(owner: LifecycleOwner, observer: (T?) -> Unit) {
|
||||
this.observe(owner, Observer<T> { observer(it) })
|
||||
this.observe(owner) { observer(it!!) }
|
||||
}
|
||||
|
@ -2,7 +2,6 @@ package com.fsck.k9.ui.endtoend
|
||||
|
||||
import android.app.PendingIntent
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.lifecycle.Observer
|
||||
import com.fsck.k9.Account
|
||||
import com.fsck.k9.Preferences
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
@ -25,8 +24,12 @@ class AutocryptKeyTransferPresenter internal constructor(
|
||||
private lateinit var showTransferCodePi: PendingIntent
|
||||
|
||||
init {
|
||||
viewModel.autocryptSetupMessageLiveEvent.observe(lifecycleOwner, Observer { msg -> msg?.let { onEventAutocryptSetupMessage(it) } })
|
||||
viewModel.autocryptSetupTransferLiveEvent.observe(lifecycleOwner, Observer { pi -> onLoadedAutocryptSetupTransfer(pi) })
|
||||
viewModel.autocryptSetupMessageLiveEvent.observe(lifecycleOwner) { msg ->
|
||||
msg?.let { onEventAutocryptSetupMessage(it) }
|
||||
}
|
||||
viewModel.autocryptSetupTransferLiveEvent.observe(lifecycleOwner) { pi ->
|
||||
onLoadedAutocryptSetupTransfer(pi)
|
||||
}
|
||||
}
|
||||
|
||||
fun initFromIntent(accountUuid: String?) {
|
||||
|
@ -13,7 +13,6 @@ import com.fsck.k9.ui.R
|
||||
import com.fsck.k9.ui.base.K9Activity
|
||||
import com.fsck.k9.ui.fragmentTransaction
|
||||
import com.fsck.k9.ui.fragmentTransactionWithBackStack
|
||||
import com.fsck.k9.ui.observe
|
||||
import com.fsck.k9.ui.observeNotNull
|
||||
import org.koin.androidx.viewmodel.ext.android.viewModel
|
||||
import timber.log.Timber
|
||||
|
@ -24,7 +24,6 @@ import com.fsck.k9.mailstore.FolderType
|
||||
import com.fsck.k9.mailstore.RemoteFolder
|
||||
import com.fsck.k9.ui.R
|
||||
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity
|
||||
import com.fsck.k9.ui.observe
|
||||
import com.fsck.k9.ui.settings.onClick
|
||||
import com.fsck.k9.ui.settings.oneTimeClickListener
|
||||
import com.fsck.k9.ui.settings.remove
|
||||
|
@ -13,7 +13,7 @@ buildscript {
|
||||
'kotlinCoroutines': '1.4.3',
|
||||
'androidxAppCompat': '1.2.0',
|
||||
'androidxRecyclerView': '1.1.0',
|
||||
'androidxLifecycle': '2.2.0',
|
||||
'androidxLifecycle': '2.3.1',
|
||||
'androidxAnnotation': '1.1.0',
|
||||
'androidxNavigation': '2.3.1',
|
||||
'androidxConstraintLayout': '2.0.4',
|
||||
|
Loading…
Reference in New Issue
Block a user