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

Add isValid check to RealmChangeListener to prevent crashes on deleted objects

Browse Source
This commit is contained in:
ariskotsomitopoulos 2022-04-05 20:36:33 +03:00
parent 59d87df0ca
commit 37dc77cc3e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/SendingEventsDataSource.kt
View File

@ -45,9 +45,11 @@ internal class RealmSendingEventsDataSource(
private var frozenSendingTimelineEvents: RealmList<TimelineEventEntity>? = null private var frozenSendingTimelineEvents: RealmList<TimelineEventEntity>? = null
private val sendingTimelineEventsListener = RealmChangeListener<RealmList<TimelineEventEntity>> { events -> private val sendingTimelineEventsListener = RealmChangeListener<RealmList<TimelineEventEntity>> { events ->
uiEchoManager.onSentEventsInDatabase(events.map { it.eventId }) if (events.isValid) {
updateFrozenResults(events) uiEchoManager.onSentEventsInDatabase(events.map { it.eventId })
onEventsUpdated(false) updateFrozenResults(events)
onEventsUpdated(false)
}
} }
override fun start() { override fun start() {

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

@ -2393,7 +2393,6 @@ class TimelineFragment @Inject constructor(
.setCancelable(true) .setCancelable(true)
.setNegativeButton(R.string.action_not_now) { _, _ -> } .setNegativeButton(R.string.action_not_now) { _, _ -> }
.setPositiveButton(R.string.action_try_it_out) { _, _ -> .setPositiveButton(R.string.action_try_it_out) { _, _ ->
timelineViewModel.onCleared() // We should first clear our viewModel
threadsManager.enableThreadsAndRestart(it) threadsManager.enableThreadsAndRestart(it)
} }
.show() .show()