rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop listening timeline collection changes when app is not resumed (#7734)

Browse Source
This commit is contained in:
Nikita Fedrunov 2022-12-09 09:42:45 +01:00 committed by GitHub
parent ee737025f2
commit cf59c80100
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
[Notifications] Fixed a bug when push notification was automatically dismissed while app is on background

3
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View File

@ -975,6 +975,7 @@ class TimelineFragment :
notificationDrawerManager.setCurrentThread(timelineArgs.threadTimelineArgs?.rootThreadEventId) notificationDrawerManager.setCurrentThread(timelineArgs.threadTimelineArgs?.rootThreadEventId)
roomDetailPendingActionStore.data?.let { handlePendingAction(it) } roomDetailPendingActionStore.data?.let { handlePendingAction(it) }
roomDetailPendingActionStore.data = null roomDetailPendingActionStore.data = null
views.timelineRecyclerView.adapter = timelineEventController.adapter
} }
private fun handlePendingAction(roomDetailPendingAction: RoomDetailPendingAction) { private fun handlePendingAction(roomDetailPendingAction: RoomDetailPendingAction) {
@ -993,6 +994,7 @@ class TimelineFragment :
super.onPause() super.onPause()
notificationDrawerManager.setCurrentRoom(null) notificationDrawerManager.setCurrentRoom(null)
notificationDrawerManager.setCurrentThread(null) notificationDrawerManager.setCurrentThread(null)
views.timelineRecyclerView.adapter = null
} }
private val emojiActivityResultLauncher = registerStartForActivityResult { activityResult -> private val emojiActivityResultLauncher = registerStartForActivityResult { activityResult ->
@ -1058,7 +1060,6 @@ class TimelineFragment :
it.dispatchTo(scrollOnHighlightedEventCallback) it.dispatchTo(scrollOnHighlightedEventCallback)
} }
timelineEventController.addModelBuildListener(modelBuildListener) timelineEventController.addModelBuildListener(modelBuildListener)
views.timelineRecyclerView.adapter = timelineEventController.adapter
if (vectorPreferences.swipeToReplyIsEnabled()) { if (vectorPreferences.swipeToReplyIsEnabled()) {
val quickReplyHandler = object : RoomMessageTouchHelperCallback.QuickReplayHandler { val quickReplyHandler = object : RoomMessageTouchHelperCallback.QuickReplayHandler {