Fix ConcurrentModificationException

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt

@@ -88,34 +88,37 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
 
     private val listUpdateCallback = object : ListUpdateCallback {
 
-        @Synchronized
         override fun onChanged(position: Int, count: Int, payload: Any?) {
+            synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
                 (position until (position + count)).forEach {
                     modelCache[it] = null
                 }
                 requestModelBuild()
             }
+        }
 
-        @Synchronized
         override fun onMoved(fromPosition: Int, toPosition: Int) {
+            synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
                 val model = modelCache.removeAt(fromPosition)
                 modelCache.add(toPosition, model)
                 requestModelBuild()
             }
+        }
 
-        @Synchronized
         override fun onInserted(position: Int, count: Int) {
+            synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
                 (0 until count).forEach {
                     modelCache.add(position, null)
                 }
                 requestModelBuild()
             }
+        }
 
-        @Synchronized
         override fun onRemoved(position: Int, count: Int) {
+            synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
                 (0 until count).forEach {
                     modelCache.removeAt(position)
@@ -123,6 +126,7 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
                 requestModelBuild()
             }
         }
+    }
 
     init {
         requestModelBuild()
@@ -134,19 +138,23 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
             this.timeline?.listener = this
 
             // Clear cache
+            synchronized(modelCache) {
                 for (i in 0 until modelCache.size) {
                     modelCache[i] = null
                 }
             }
+        }
 
         if (this.eventIdToHighlight != eventIdToHighlight) {
             // Clear cache to force a refresh
+            synchronized(modelCache) {
                 for (i in 0 until modelCache.size) {
                     if (modelCache[i]?.eventId == eventIdToHighlight
                             || modelCache[i]?.eventId == this.eventIdToHighlight) {
                         modelCache[i] = null
                     }
                 }
+            }
             this.eventIdToHighlight = eventIdToHighlight
 
             requestModelBuild()
@@ -194,8 +202,8 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
         require(inSubmitList || Looper.myLooper() == backgroundHandler.looper)
     }
 
-    @Synchronized
     private fun getModels(): List<EpoxyModel<*>> {
+        synchronized(modelCache) {
             (0 until modelCache.size).forEach { position ->
                 // Should be build if not cached or if cached but contains mergedHeader or formattedDay
                 // We then are sure we always have items up to date.
@@ -217,6 +225,7 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
                     .flatten()
                     .filterNotNull()
         }
+    }
 
 
     private fun buildItemModels(currentPosition: Int, items: List<TimelineEvent>): CacheItemData {
@@ -296,6 +305,7 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
     }
 
     fun searchPositionOfEvent(eventId: String): Int? {
+        synchronized(modelCache) {
             // Search in the cache
             modelCache.forEachIndexed { idx, cacheItemData ->
                 if (cacheItemData?.eventId == eventId) {
@@ -305,7 +315,7 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
 
             return null
         }
-
+    }
 }
 
 private data class CacheItemData(