bida/busky
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix LiveData nullability issues (#2181)

Browse source
This commit is contained in:
Konrad Pozniak 2021-05-31 15:16:07 +02:00 committed by GitHub
parent 3091db8c27
commit e032d38d56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsViewModel.kt
View file

@ -67,7 +67,7 @@ class AnnouncementsViewModel @Inject constructor(
appDatabase.instanceDao().insertOrReplace(it) appDatabase.instanceDao().insertOrReplace(it)
} }
.subscribe({ .subscribe({
emojisMutable.postValue(it.emojiList) emojisMutable.postValue(it.emojiList.orEmpty())
}, { }, {
Log.w(TAG, "Failed to get custom emojis.", it) Log.w(TAG, "Failed to get custom emojis.", it)
}) })

2
app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsRepository.kt
View file

@ -71,7 +71,7 @@ class ConversationsRepository @Inject constructor(val mastodonApi: MastodonApi,
// we are using a mutable live data to trigger refresh requests which eventually calls // we are using a mutable live data to trigger refresh requests which eventually calls
// refresh method and gets a new live data. Each refresh request by the user becomes a newly // refresh method and gets a new live data. Each refresh request by the user becomes a newly
// dispatched data in refreshTrigger // dispatched data in refreshTrigger
val refreshTrigger = MutableLiveData<Unit>() val refreshTrigger = MutableLiveData<Unit?>()
val refreshState = Transformations.switchMap(refreshTrigger) { val refreshState = Transformations.switchMap(refreshTrigger) {
refresh(accountId, true) refresh(accountId, true)
} }

8
app/src/main/java/com/keylesspalace/tusky/components/report/ReportViewModel.kt
View file

@ -37,8 +37,8 @@ class ReportViewModel @Inject constructor(
private val eventHub: EventHub, private val eventHub: EventHub,
private val statusesRepository: StatusesRepository) : RxAwareViewModel() { private val statusesRepository: StatusesRepository) : RxAwareViewModel() {
private val navigationMutable = MutableLiveData<Screen>() private val navigationMutable = MutableLiveData<Screen?>()
val navigation: LiveData<Screen> = navigationMutable val navigation: LiveData<Screen?> = navigationMutable
private val muteStateMutable = MutableLiveData<Resource<Boolean>>() private val muteStateMutable = MutableLiveData<Resource<Boolean>>()
val muteState: LiveData<Resource<Boolean>> = muteStateMutable val muteState: LiveData<Resource<Boolean>> = muteStateMutable
@ -49,8 +49,8 @@ class ReportViewModel @Inject constructor(
private val reportingStateMutable = MutableLiveData<Resource<Boolean>>() private val reportingStateMutable = MutableLiveData<Resource<Boolean>>()
var reportingState: LiveData<Resource<Boolean>> = reportingStateMutable var reportingState: LiveData<Resource<Boolean>> = reportingStateMutable
private val checkUrlMutable = MutableLiveData<String>() private val checkUrlMutable = MutableLiveData<String?>()
val checkUrl: LiveData<String> = checkUrlMutable val checkUrl: LiveData<String?> = checkUrlMutable
private val repoResult = MutableLiveData<BiListing<Status>>() private val repoResult = MutableLiveData<BiListing<Status>>()
val statuses: LiveData<PagedList<Status>> = Transformations.switchMap(repoResult) { it.pagedList } val statuses: LiveData<PagedList<Status>> = Transformations.switchMap(repoResult) { it.pagedList }