Skip to content

Fix memory leak: return early on image cache hit in MessageImageView #93

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

Merged
viktorstrate merged 1 commit into from
Apr 9, 2026
+14 −5
Merged

Fix memory leak: return early on image cache hit in MessageImageView #93

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
19 changes: 14 additions & 5 deletions Mactrix/Views/ChatView/MessageImageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,23 @@ struct MessageImageView: View {
return
}

let cacheKey = NSString(string: content.source.url())
if let cached = MatrixClient.imageCache.object(forKey: cacheKey) {
image = Image(nsImage: cached)
}

// Two caching layers serve different purposes:
// - NSCache (checked in init): synchronously pre-populates `image` before the
// view appears, preventing flicker on scroll/revisit. Also skips the expensive
// decode step (toOrientedImage) on repeat loads below.
// - SDK media cache (getMediaContent): avoids network re-fetches. Always called
// here so `imageData` is populated for drag-and-drop, even when the decoded
// NSImage is already in the NSCache.
do {
let data = try await matrixClient.client.getMediaContent(mediaSource: content.source)
imageData = data

let cacheKey = NSString(string: content.source.url())
if let cached = MatrixClient.imageCache.object(forKey: cacheKey) {
image = Image(nsImage: cached)
return
}

let nsImage = try data.toOrientedImage(contentType: contentType)
MatrixClient.imageCache.setObject(nsImage, forKey: cacheKey, cost: data.count)
image = Image(nsImage: nsImage)
Expand Down
Loading