Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed crash observed on Samsung Z Fold 2 while forwarding a message to a new chat room

Browse source
This commit is contained in:
Sylvain Berfini 2022-09-14 15:04:24 +02:00
parent 003a73577a
commit e4c64a2b5b
1 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
View file

@ -89,6 +89,35 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
}
}
private val globalLayoutLayout = object : OnGlobalLayoutListener {
override fun onGlobalLayout() {
if (isBindingAvailable()) {
binding.chatMessagesList
.viewTreeObserver
.removeOnGlobalLayoutListener(this)
if (::chatScrollListener.isInitialized) {
binding.chatMessagesList.addOnScrollListener(chatScrollListener)
}
if (viewModel.chatRoom.unreadMessagesCount > 0) {
Log.i("[Chat Room] Messages have been displayed, scrolling to first unread")
val notAllMessagesDisplayed = scrollToFirstUnreadMessageOrBottom(false)
if (notAllMessagesDisplayed) {
Log.w("[Chat Room] More unread messages than the screen can display, do not mark chat room as read now, wait for user to scroll to bottom")
} else {
// Consider user as scrolled to the end when marking chat room as read
viewModel.isUserScrollingUp.value = false
Log.i("[Chat Room] Marking chat room as read")
viewModel.chatRoom.markAsRead()
}
}
} else {
Log.e("[Chat Room] Binding not available in onGlobalLayout callback!")
}
}
}
private lateinit var chatScrollListener: ChatScrollListener
override fun getLayoutId(): Int {
@ -731,36 +760,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
// Wait for items to be displayed
binding.chatMessagesList
.viewTreeObserver
.addOnGlobalLayoutListener(
object : OnGlobalLayoutListener {
override fun onGlobalLayout() {
binding.chatMessagesList
.viewTreeObserver
.removeOnGlobalLayoutListener(this)
if (isBindingAvailable()) {
if (::chatScrollListener.isInitialized) {
binding.chatMessagesList.addOnScrollListener(chatScrollListener)
}
if (viewModel.chatRoom.unreadMessagesCount > 0) {
Log.i("[Chat Room] Messages have been displayed, scrolling to first unread")
val notAllMessagesDisplayed = scrollToFirstUnreadMessageOrBottom(false)
if (notAllMessagesDisplayed) {
Log.w("[Chat Room] More unread messages than the screen can display, do not mark chat room as read now, wait for user to scroll to bottom")
} else {
// Consider user as scrolled to the end when marking chat room as read
viewModel.isUserScrollingUp.value = false
Log.i("[Chat Room] Marking chat room as read")
viewModel.chatRoom.markAsRead()
}
}
} else {
Log.e("[Chat Room] Binding not available in onGlobalLayout callback!")
}
}
}
)
.addOnGlobalLayoutListener(globalLayoutLayout)
} else {
Log.e("[Chat Room] Fragment resuming but viewModel lateinit property isn't initialized!")
}
@ -771,6 +771,9 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
binding.chatMessagesList.removeOnScrollListener(chatScrollListener)
}
binding.chatMessagesList
.viewTreeObserver.removeOnGlobalLayoutListener(globalLayoutLayout)
if (_adapter != null) {
try {
adapter.unregisterAdapterDataObserver(observer)