Skip to content

High performance self-hosted photo and video management solution.

fix: ios widget webp support (#19469)

Brandon Wees2e13543d5dbf
diff --git a/mobile/ios/WidgetExtension/ImageWidgetView.swift b/mobile/ios/WidgetExtension/ImageWidgetView.swift
index ff11133e51..2c84acc074 100644
--- a/mobile/ios/WidgetExtension/ImageWidgetView.swift
+++ b/mobile/ios/WidgetExtension/ImageWidgetView.swift
@@ -24,27 +24,11 @@ struct ImageEntry: TimelineEntry {
struct ImmichWidgetView: View {
var entry: ImageEntry
- func getErrorText(_ error: WidgetError?) -> String {
- switch error {
- case .noLogin:
- return "Login to Immich"
-
- case .fetchFailed:
- return "Unable to connect to your Immich instance"
-
- case .albumNotFound:
- return "Album not found"
-
- default:
- return "An unknown error occured"
- }
- }
-
var body: some View {
if entry.image == nil {
VStack {
Image("LaunchImage")
- Text(getErrorText(entry.error))
+ Text(entry.error?.errorDescription ?? "")
.minimumScaleFactor(0.25)
.multilineTextAlignment(.center)
.foregroundStyle(.secondary)
diff --git a/mobile/ios/WidgetExtension/ImmichAPI.swift b/mobile/ios/WidgetExtension/ImmichAPI.swift
index 4da610f1c7..628c7311ee 100644
--- a/mobile/ios/WidgetExtension/ImmichAPI.swift
+++ b/mobile/ios/WidgetExtension/ImmichAPI.swift
@@ -8,6 +8,32 @@ enum WidgetError: Error {
case unknown
case albumNotFound
case unableToResize
+ case invalidImage
+ case invalidURL
+}
+
+extension WidgetError: LocalizedError {
+ public var errorDescription: String? {
+ switch self {
+ case .noLogin:
+ return "Login to Immich"
+
+ case .fetchFailed:
+ return "Unable to connect to your Immich instance"
+
+ case .albumNotFound:
+ return "Album not found"
+
+ case .invalidURL:
+ return "An invalid URL was used"
+
+ case .invalidImage:
+ return "An invalid image was received"
+
+ default:
+ return "An unknown error occured"
+ }
+ }
}
enum AssetType: String, Codable {
@@ -146,7 +172,7 @@ class ImmichAPI {
return try JSONDecoder().decode([MemoryResult].self, from: data)
}
- func fetchImage(asset: SearchResult) async throws -> UIImage {
+ func fetchImage(asset: SearchResult) async throws(WidgetError) -> UIImage {
let thumbnailParams = [URLQueryItem(name: "size", value: "preview")]
let assetEndpoint = "/assets/" + asset.id + "/thumbnail"
@@ -157,16 +183,24 @@ class ImmichAPI {
params: thumbnailParams
)
else {
- throw URLError(.badURL)
+ throw .invalidURL
+ }
+
+ guard let imageSource = CGImageSourceCreateWithURL(fetchURL as CFURL, nil) else {
+ throw .invalidURL
}
- let (data, _) = try await URLSession.shared.data(from: fetchURL)
-
- guard let img = UIImage(data: data) else {
- throw URLError(.badServerResponse)
+ let decodeOptions: [NSString: Any] = [
+ kCGImageSourceCreateThumbnailFromImageAlways: true,
+ kCGImageSourceThumbnailMaxPixelSize: 400,
+ kCGImageSourceCreateThumbnailWithTransform: true
+ ]
+
+ guard let thumbnail = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, decodeOptions as CFDictionary) else {
+ throw .fetchFailed
}
- return img
+ return UIImage(cgImage: thumbnail)
}
func fetchAlbums() async throws -> [Album] {