Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(android): Avoid ConcurrentModificationException #1297

Merged
merged 6 commits into from Oct 8, 2022
Merged

fix(android): Avoid ConcurrentModificationException #1297

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19fd53d
fix: Avoid ConcurrentModificationException
spydon Oct 3, 2022
4a78c22
Try other method of avoiding ConcurrentModificationException
spydon Oct 3, 2022
45b7d4e
while -> for
spydon Oct 3, 2022
c0a22fc
Try with `ConcurrentMap`
spydon Oct 5, 2022
ef2c322
Merge branch 'main' into spydon/fix-concurrent-modification
spydon Oct 5, 2022
9992659
fix(android): use concurrent map for players
Gustl22 Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../audioplayers_android/android/src/main/kotlin/xyz/luan/audioplayers/AudioplayersPlugin.kt
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@ import xyz.luan.audioplayers.player.WrappedPlayer
import xyz.luan.audioplayers.source.BytesSource
import xyz.luan.audioplayers.source.UrlSource
import java.lang.ref.WeakReference
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ConcurrentMap

typealias FlutterHandler = (call: MethodCall, response: MethodChannel.Result) -> Unit

Expand All @@ -27,7 +29,7 @@ class AudioplayersPlugin : FlutterPlugin, IUpdateCallback {
private lateinit var globalChannel: MethodChannel
private lateinit var context: Context

private val players = mutableMapOf<String, WrappedPlayer>()
private val players = ConcurrentHashMap<String, WrappedPlayer>()
private val handler = Handler(Looper.getMainLooper())
private var updateRunnable: Runnable? = null

Expand Down Expand Up @@ -189,7 +191,7 @@ class AudioplayersPlugin : FlutterPlugin, IUpdateCallback {
}

private class UpdateRunnable(
mediaPlayers: Map<String, WrappedPlayer>,
mediaPlayers: ConcurrentMap<String, WrappedPlayer>,
channel: MethodChannel,
handler: Handler,
updateCallback: IUpdateCallback,
Expand Down