ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address the real lifetime issue of the SDK's Client by making Context.mediaProvider weak. (#4466)

Browse Source 
This reverts commit 927aea4bfe.
This commit is contained in:
Doug
2025-09-05 18:18:14 +01:00
committed by GitHub
parent f30f3b1a63
commit c794144ef1
58 changed files with 380 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Media/Provider/MediaLoader.swift
+5 -18
View File
@@ -16,17 +16,7 @@ private final class MediaRequest {
}
actor MediaLoader: MediaLoaderProtocol {
// Something is holding onto our MediaProvider (and therefore this MediaLoader) which means
// when attempting to clear the caches, the SDK's Client hangs around and we end up with 2.
// I have spent a long time trying to understand what's going on – there's instances of both
// TimelineViewModel.Context and ComposerToolbarViewModel.Context still hanging around and
// a closure captures the media provider from both of those as far as I can tell, but I was
// unable to break the reference. Possibly related to the ElementTextView too.
//
// In lieu of the real fix, lets use a weak reference to the Client here so that it can be
// released and hopefully that will solve our logs files exploding in size when encountering
// a corrupt/missing database file.
private weak var client: ClientProtocol?
private let client: ClientProtocol
private var ongoingRequests = [MediaSourceProxy: MediaRequest]()
init(client: ClientProtocol) {
@@ -34,21 +24,18 @@ actor MediaLoader: MediaLoaderProtocol {
}
func loadMediaContentForSource(_ source: MediaSourceProxy) async throws -> Data {
try await enqueueLoadMediaRequest(forSource: source) { [weak client] in
guard let client else { throw MediaLoaderError.missingClient }
return try await client.getMediaContent(mediaSource: source.underlyingSource)
try await enqueueLoadMediaRequest(forSource: source) {
try await self.client.getMediaContent(mediaSource: source.underlyingSource)
}
}
func loadMediaThumbnailForSource(_ source: MediaSourceProxy, width: UInt, height: UInt) async throws -> Data {
try await enqueueLoadMediaRequest(forSource: source) { [weak client] in
guard let client else { throw MediaLoaderError.missingClient }
return try await client.getMediaThumbnail(mediaSource: source.underlyingSource, width: UInt64(width), height: UInt64(height))
try await enqueueLoadMediaRequest(forSource: source) {
try await self.client.getMediaThumbnail(mediaSource: source.underlyingSource, width: UInt64(width), height: UInt64(height))
}
}
func loadMediaFileForSource(_ source: MediaSourceProxy, filename: String?) async throws -> MediaFileHandleProxy {
guard let client else { throw MediaLoaderError.missingClient }
let result = try await client.getMediaFile(mediaSource: source.underlyingSource,
filename: filename,
mimeType: source.mimeType ?? "application/octet-stream",