Merge pull request #6469 from vector-im/feature/bma/fix_crash_on_Defa…

…ultBackgroundDetectionObserver Fix ConcurrentModificationException on BackgroundDetectionObserver
element-hq · Jul 7, 2022 · 4126e64 · 4126e64
2 parents 09f158e + b68e01c
commit 4126e64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelog.d/6469.bugfix b/changelog.d/6469.bugfix
@@ -0,0 +1 @@
+Fix ConcurrentModificationException on BackgroundDetectionObserver
diff --git a/...android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt b/...android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.util
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import timber.log.Timber
+import java.util.concurrent.CopyOnWriteArraySet
 
 internal interface BackgroundDetectionObserver : DefaultLifecycleObserver {
     val isInBackground: Boolean
@@ -37,7 +38,7 @@ internal class DefaultBackgroundDetectionObserver : BackgroundDetectionObserver
     override var isInBackground: Boolean = true
         private set
 
-    private val listeners = LinkedHashSet<BackgroundDetectionObserver.Listener>()
+    private val listeners = CopyOnWriteArraySet<BackgroundDetectionObserver.Listener>()
 
     override fun register(listener: BackgroundDetectionObserver.Listener) {
         listeners.add(listener)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix ConcurrentModificationException on BackgroundDetectionObserver