ChatActivity: fix crash, fix sticker button enabling conditions

4 years ago · f18f7aab5c
parent cbe737ef54
commit f18f7aab5c
1 changed files with 2 additions and 2 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/components/chat/ChatActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/chat/ChatActivity.kt
@ -385,9 +385,9 @@ class ChatActivity: BottomSheetActivity(),

                enableSendButton()
                enableButton(attachmentButton, notHaveMedia, notHaveMedia)
-                enableButton(stickerButton, haveStickers, haveStickers)
+                enableButton(stickerButton, haveStickers && notHaveMedia, haveStickers && notHaveMedia)

-                if(!it.isNotEmpty()) {
+                if(!notHaveMedia) {
                    val media = it[0]

                    when(media.type) {