chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

upgrade dependencies (#1990)

Browse source 
* upgrade dependencies

* fix tests
This commit is contained in:
Konrad Pozniak 2020-11-22 19:02:54 +01:00 • committed by GitHub
commit 34fb546200
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
View file

@ -79,7 +79,7 @@ class AnnouncementsActivity : BaseActivity(), AnnouncementActionListener, OnEmoj
announcementsList.addItemDecoration(divider)
announcementsList.adapter = adapter
viewModel.announcements.observe(this, Observer {
viewModel.announcements.observe(this) {
when (it) {
is Success -> {
progressBar.hide()
@ -104,11 +104,11 @@ class AnnouncementsActivity : BaseActivity(), AnnouncementActionListener, OnEmoj
errorMessageView.show()
}
}
})
}
viewModel.emojis.observe(this, Observer {
viewModel.emojis.observe(this) {
picker.adapter = EmojiAdapter(it, this)
})
}
viewModel.load()
progressBar.show()

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

@ -51,7 +51,7 @@ class AnnouncementsViewModel @Inject constructor(
.map<Either<InstanceEntity, Instance>> { Either.Left(it) }
.onErrorResumeNext(
mastodonApi.getInstance()
.map { Either.Right<InstanceEntity, Instance>(it) }
.map { Either.Right(it) }
)
) { emojis, either ->
either.asLeftOrNull()?.copy(emojiList = emojis)