Unverified Commit 3934dd57 authored by Lucio Maciel's avatar Lucio Maciel Committed by GitHub

Merge pull request #1896 from RocketChat/fix/fix-reaction-crash

[FIX] Crash on reaction long press
parents 9972928a 43691b65
......@@ -87,7 +87,9 @@ import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.emoji_image_row_item.*
import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
import kotlinx.android.synthetic.main.emoji_row_item.*
import kotlinx.android.synthetic.main.emoji_row_item.view.*
import kotlinx.android.synthetic.main.fragment_chat_room.*
import kotlinx.android.synthetic.main.message_attachment_options.*
import kotlinx.android.synthetic.main.message_composer.*
......@@ -96,6 +98,7 @@ import timber.log.Timber
import java.io.File
import java.io.IOException
import kotlinx.android.synthetic.main.reaction_praises_list_item.*
import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicInteger
import javax.inject.Inject
......@@ -704,9 +707,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
GlideApp.with(requireContext()).asBitmap()
}
glideRequest.load(url).into(emoji_image_view)
glideRequest.load(url).into(view_flipper.emoji_image_view)
} else {
emoji_view.text = EmojiParser.parse(requireContext(), shortname)
view_flipper.emoji_view.text = EmojiParser.parse(requireContext(), shortname)
}
var listing = ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment