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

Fixes #2291 - Wrong notification placeholder avatar orientation on 17.2.1

Browse Source
This commit is contained in:
Stefan Ceriu
2024-01-04 15:36:46 +02:00
parent d338fd0e05
commit 6c9efaf557
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Extensions/UNNotificationContent.swift
+10 -5
View File
@@ -180,7 +180,7 @@ extension UNMutableNotificationContent {
private func getPlaceholderAvatarImageData(name: String, id: String) async -> Data? {
// The version value is used in case the design of the placeholder is updated to force a replacement
let shouldFlipAvatar = shouldFlipAvatar()
let prefix = "notification_placeholder\(shouldFlipAvatar ? "V5" : "V4")"
let prefix = "notification_placeholder\(shouldFlipAvatar ? "V7" : "V6")"
let fileName = "\(prefix)_\(name)_\(id).png"
if let data = try? Data(contentsOf: URL.temporaryDirectory.appendingPathComponent(fileName)) {
MXLog.info("Found existing notification icon placeholder")
@@ -224,7 +224,8 @@ extension UNMutableNotificationContent {
}
/// On simulators and macOS the image is rendered correctly
/// On devices before iOS 17 and after iOS 17.2 it's rendered upside down and needs to be flipped
/// On devices before iOS 17 and iOS 17.2.0 it's rendered upside down and needs to be flipped
/// On all other versions it's rendered correctly and **doesn't** need to be flipped
private func shouldFlipAvatar() -> Bool {
#if targetEnvironment(simulator)
return false
@@ -237,11 +238,15 @@ extension UNMutableNotificationContent {
return false
}
if version >= Version(17, 0, 0), version < Version(17, 2, 0) {
return false
if version < Version(17, 0, 0) {
return true
}
return true
if version == Version(17, 2, 0) {
return true
}
return false
#endif
}
}