High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: make sure iOS memory widget render (#30172)
Alexcf213c81e319
diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxprojindex 227fe248be..b569693971 100644--- a/mobile/ios/Runner.xcodeproj/project.pbxproj+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj@@ -3,7 +3,7 @@archiveVersion = 1;classes = {};- objectVersion = 77;+ objectVersion = 54;objects = {/* Begin PBXBuildFile section */@@ -89,6 +89,7 @@1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };+ 51516E0F2A0000000000C0F1 /* Signing.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Signing.xcconfig; sourceTree = "<group>"; };614A7F5DC5DB09E89E4FCBE8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };681FBA560D5D2ADDE4F0B59E /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };6D160F04A389B9FFBC557803 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };@@ -96,7 +97,6 @@74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };- 51516E0F2A0000000000C0F1 /* Signing.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Signing.xcconfig; sourceTree = "<group>"; };8AB817AA297EDEC88B23F3F6 /* Pods_ShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };937632897A02DE9C249F20A6 /* Pods-ShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.debug.xcconfig"; sourceTree = "<group>"; };9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolvedindex a9381e541a..e1c39435fa 100644--- a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved+++ b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved@@ -32,8 +32,8 @@"kind" : "remoteSourceControl","location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git","state" : {- "revision" : "60d9bb85c94ce6e7fc4406cd32529fd12bdb7809",- "version" : "6.14.0"+ "revision" : "84a79bc375a301169390ac110c868f06c857b83f",+ "version" : "6.27.0"}},{diff --git a/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift b/mobile/ios/WidgetExtension/widgets/MemoryWidget.swiftindex 22414fbec4..15fa3d722e 100644--- a/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift+++ b/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift@@ -83,35 +83,42 @@ struct ImmichMemoryProvider: TimelineProvider {return}- let memories = try await api.fetchMemory(for: Date.now)-- await withTaskGroup(of: ImageEntry?.self) { group in- var totalAssets = 0-- for memory in memories {- for asset in memory.assets {- if asset.type == .image && totalAssets < 12 {- group.addTask {- try? await ImageEntry.build(- api: api,- asset: asset,- dateOffset: totalAssets,- subtitle: getYearDifferenceSubtitle(- assetYear: memory.data.year+ let memories: [MemoryResult]+ do {+ memories = try await api.fetchMemory(for: Date.now)++ await withTaskGroup(of: ImageEntry?.self) { group in+ var totalAssets = 0++ for memory in memories {+ for asset in memory.assets {+ if asset.type == .image && totalAssets < 12 {+ group.addTask {+ try? await ImageEntry.build(+ api: api,+ asset: asset,+ dateOffset: totalAssets,+ subtitle: getYearDifferenceSubtitle(+ assetYear: memory.data.year+ ))- )- }+ }- totalAssets += 1+ totalAssets += 1+ }}}- }- for await result in group {- if let entry = result {- entries.append(entry)+ for await result in group {+ if let entry = result {+ entries.append(entry)+ }}}++ } catch {+ completion(ImageEntry.handleError(for: cacheKey))+ return}// If we didn't add any memory images (some failure occurred or no images in memory),