Skip to content

fix: prevent crash when monitoring Live Activities #46

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

Draft
tarikfp wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: prevent crash when monitoring Live Activities #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aef2a6
fix: prevent crash when monitoring Live Activities
tarikfp Jan 26, 2026
5f0f0f3
fix: use OSAllocatedUnfairLock instead of DispatchQueue
tarikfp Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions ios/app/VoltraModule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import ActivityKit
import Compression
import ExpoModulesCore
import Foundation
import os
import WidgetKit

public class VoltraModule: Module {
Expand All @@ -10,7 +11,7 @@ public class VoltraModule: Module {
private let TIMELINE_WARNING_SIZE = 100_000 // 100KB per timeline
private let liveActivityService = VoltraLiveActivityService()
private var wasLaunchedInBackground: Bool = false
private var monitoredActivityIds: Set<String> = []
private let monitoredActivityIds = OSAllocatedUnfairLock<Set<String>>(initialState: [])

enum VoltraErrors: Error {
case unsupportedOS
Expand Down Expand Up @@ -55,7 +56,7 @@ public class VoltraModule: Module {

OnStopObserving {
VoltraEventBus.shared.unsubscribe()
monitoredActivityIds.removeAll()
monitoredActivityIds.withLock { $0.removeAll() }
}

OnCreate {
Expand Down Expand Up @@ -608,32 +609,38 @@ private extension VoltraModule {

/// Set up observers for an activity's lifecycle (only once per activity)
private func monitorActivity(_ activity: Activity<VoltraAttributes>) {
guard activity.activityState != .ended else { return }

let activityId = activity.id
let activityName = activity.attributes.name
let pushEnabled = pushNotificationsEnabled

// Skip if we're already monitoring this activity
guard !monitoredActivityIds.contains(activityId) else { return }
monitoredActivityIds.insert(activityId)
// Thread-safe check-and-insert
let shouldMonitor = monitoredActivityIds.withLock { ids -> Bool in
guard !ids.contains(activityId) else { return false }
ids.insert(activityId)
return true
}
guard shouldMonitor else { return }

// Observe lifecycle state changes (active → dismissed → ended)
Task {
for await state in activity.activityStateUpdates {
VoltraEventBus.shared.send(
.stateChange(
activityName: activity.attributes.name,
activityName: activityName,
state: String(describing: state)
)
)
}
}

// Observe push token updates if enabled
if pushNotificationsEnabled {
if pushEnabled {
Task {
for await pushTokenData in activity.pushTokenUpdates {
let pushTokenString = pushTokenData.hexString
VoltraEventBus.shared.send(
.tokenReceived(
activityName: activity.attributes.name,
activityName: activityName,
pushToken: pushTokenString
)
)
Expand Down
Loading