Skip to content

fix(ios): dispatch Dictionary access to main thread in offline controllers #1119

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

Open
mateusztylman wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −11
Open

fix(ios): dispatch Dictionary access to main thread in offline controllers #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions ios/mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/OfflineController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,14 @@ final class OfflineController: _OfflineManager {
offlineManager.loadStylePack(
for: styleURI,
loadOptions: loadOptions) { [weak self] progress in
self?.progressHandlers[uri]?.eventSink?(progress.toFLTStylePackLoadProgress().toList())
DispatchQueue.main.async {
self?.progressHandlers[uri]?.eventSink?(progress.toFLTStylePackLoadProgress().toList())
}
} completion: { [weak self] result in
executeOnMainThread(completion)(result.map { $0.toFLTStylePack() })
self?.progressHandlers.removeValue(forKey: uri)
DispatchQueue.main.async {
completion(result.map { $0.toFLTStylePack() })
self?.progressHandlers.removeValue(forKey: uri)
}
}
}

Expand Down
24 changes: 16 additions & 8 deletions ...mapbox_maps_flutter/Sources/mapbox_maps_flutter/Classes/Offline/TileStoreController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ final class TileStoreController: _TileStore {
}

tileStore.loadTileRegion(forId: id, loadOptions: loadOptions) { [weak self] progress in
guard let self else { return }
self.tileRegionLoadProgressHandlers[id]?.eventSink?(progress.toFLTTileRegionLoadProgress().toList())
DispatchQueue.main.async {
guard let self else { return }
self.tileRegionLoadProgressHandlers[id]?.eventSink?(progress.toFLTTileRegionLoadProgress().toList())
}
} completion: { [weak self] result in
executeOnMainThread(completion)(result.map { $0.toFLTTileRegion() })
self?.tileRegionLoadProgressHandlers.removeValue(forKey: id)
DispatchQueue.main.async {
completion(result.map { $0.toFLTTileRegion() })
self?.tileRegionLoadProgressHandlers.removeValue(forKey: id)
}
}
}

Expand All @@ -52,11 +56,15 @@ final class TileStoreController: _TileStore {
forId: id,
loadOptions: loadOptions,
estimateOptions: estimateOptions.map(MapboxCommon.TileRegionEstimateOptions.init(fltValue:))) { [weak self] progress in
guard let self else { return }
self.tileRegionEstimateProgressHandlers[id]?.eventSink?(progress.toFLTTileRegionEstimateProgress().toList())
DispatchQueue.main.async {
guard let self else { return }
self.tileRegionEstimateProgressHandlers[id]?.eventSink?(progress.toFLTTileRegionEstimateProgress().toList())
}
} completion: { [weak self] result in
executeOnMainThread(completion)(result.map { $0.toFLTTileRegionEstimateResult() })
self?.tileRegionEstimateProgressHandlers.removeValue(forKey: id)
DispatchQueue.main.async {
completion(result.map { $0.toFLTTileRegionEstimateResult() })
self?.tileRegionEstimateProgressHandlers.removeValue(forKey: id)
}
}
}

Expand Down