filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4366 from vector-im/feature/adm/emoji-rotation-crash

Browse Source 
Fixing timeline crash when rotating emoji picker
This commit is contained in:
Benoit Marty 2021-10-29 09:01:25 +02:00 committed by GitHub
commit d36f01242a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4365.bugfix Normal file
View File

@ -0,0 +1 @@
Fixing timeline crash when rotating with the emoji window open

23
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -52,6 +52,7 @@ import androidx.core.view.forEach
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.fragment.app.setFragmentResultListener
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager
@ -639,17 +640,27 @@ class RoomDetailFragment @Inject constructor(
setImageResource(R.drawable.ic_keyboard)
}
}
.setOnEmojiPopupDismissListener {
if (isAdded) {
views.composerLayout.views.composerEmojiButton.apply {
contentDescription = getString(R.string.a11y_open_emoji_picker)
setImageResource(R.drawable.ic_insert_emoji)
}
.setOnEmojiPopupDismissListenerLifecycleAware {
views.composerLayout.views.composerEmojiButton.apply {
contentDescription = getString(R.string.a11y_open_emoji_picker)
setImageResource(R.drawable.ic_insert_emoji)
}
}
.build(views.composerLayout.views.composerEditText)
}
/**
* Ensure dismiss actions only trigger when the fragment is in the started state
* EmojiPopup by default dismisses onViewDetachedFromWindow, this can cause race conditions with onDestroyView
*/
private fun EmojiPopup.Builder.setOnEmojiPopupDismissListenerLifecycleAware(action: () -> Unit): EmojiPopup.Builder {
return setOnEmojiPopupDismissListener {
if (lifecycle.currentState == Lifecycle.State.STARTED) {
action()
}
}
}
private val permissionVoiceMessageLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
if (allGranted) {
// In this case, let the user start again the gesture