From 7e790ca469a9047d9d180b4507d981b22812a4ea Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 26 May 2023 17:12:30 +0200 Subject: [PATCH 1/5] fix --- ElementX/Sources/Other/Extensions/UNNotificationContent.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElementX/Sources/Other/Extensions/UNNotificationContent.swift b/ElementX/Sources/Other/Extensions/UNNotificationContent.swift index 916ae01b7c..221e92a44e 100644 --- a/ElementX/Sources/Other/Extensions/UNNotificationContent.swift +++ b/ElementX/Sources/Other/Extensions/UNNotificationContent.swift @@ -123,7 +123,7 @@ extension UNMutableNotificationContent { senderID: String, senderName: String, iconType: NotificationIconType) async throws -> UNMutableNotificationContent { - var image: INImage? + var image = INImage(named: "") if let mediaSource = iconType.mediaSource { switch await mediaProvider?.loadImageDataFromSource(mediaSource) { case .success(let data): @@ -161,7 +161,7 @@ extension UNMutableNotificationContent { serviceName: nil, sender: sender, attachments: nil) - if speakableGroupName != nil, let image { + if speakableGroupName != nil { intent.setImage(image, forParameterNamed: \.speakableGroupName) } From 6d2e040c698237ddbe28817e4f83c2c89d7b36be Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 26 May 2023 17:48:37 +0200 Subject: [PATCH 2/5] Element X app name --- ElementX/Sources/Application/AppCoordinator.swift | 2 +- ElementX/SupportingFiles/target.yml | 2 +- NSE/SupportingFiles/target.yml | 2 +- project.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift index ec09239f57..797b6c0121 100644 --- a/ElementX/Sources/Application/AppCoordinator.swift +++ b/ElementX/Sources/Application/AppCoordinator.swift @@ -136,7 +136,7 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationCoordinatorDelegate, } func shouldDisplayInAppNotification(_ service: NotificationManagerProtocol, content: UNNotificationContent) -> Bool { - guard let roomId = content.userInfo[NotificationConstants.UserInfoKey.roomIdentifier] as? String else { + guard let roomId = content.roomID else { return true } guard let userSessionFlowCoordinator else { diff --git a/ElementX/SupportingFiles/target.yml b/ElementX/SupportingFiles/target.yml index 2623c95b2d..9b40df75cf 100644 --- a/ElementX/SupportingFiles/target.yml +++ b/ElementX/SupportingFiles/target.yml @@ -74,7 +74,7 @@ targets: settings: base: - PRODUCT_NAME: ElementX + PRODUCT_NAME: $(APP_NAME) PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER) MARKETING_VERSION: $(MARKETING_VERSION) CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) diff --git a/NSE/SupportingFiles/target.yml b/NSE/SupportingFiles/target.yml index cc5adcd84a..66dbe2c67a 100644 --- a/NSE/SupportingFiles/target.yml +++ b/NSE/SupportingFiles/target.yml @@ -52,7 +52,7 @@ targets: settings: base: - PRODUCT_NAME: NSE + PRODUCT_NAME: $(APP_NAME) PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse MARKETING_VERSION: $(MARKETING_VERSION) CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) diff --git a/project.yml b/project.yml index 1fd824c62e..6ff146bd1f 100644 --- a/project.yml +++ b/project.yml @@ -26,6 +26,7 @@ settings: BASE_APP_GROUP_IDENTIFIER: io.element APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER) BASE_BUNDLE_IDENTIFIER: io.element.elementx + APP_NAME: ElementX KEYCHAIN_ACCESS_GROUP_IDENTIFIER: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER) MARKETING_VERSION: 1.1.2 CURRENT_PROJECT_VERSION: 1 From 63e64553574290ee68958bbb466efc06d398caf0 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 26 May 2023 17:49:33 +0200 Subject: [PATCH 3/5] project update --- ElementX.xcodeproj/project.pbxproj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 0d73d3b497..966a6d1f06 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -4252,7 +4252,7 @@ ); MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; - PRODUCT_NAME = NSE; + PRODUCT_NAME = "$(APP_NAME)"; SDKROOT = iphoneos; SWIFT_OBJC_INTERFACE_HEADER_NAME = "GeneratedInterface-Swift.h"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -4274,7 +4274,7 @@ ); MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; - PRODUCT_NAME = ElementX; + PRODUCT_NAME = "$(APP_NAME)"; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "ElementX/SupportingFiles/ElementX-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "GeneratedInterface-Swift.h"; @@ -4297,7 +4297,7 @@ ); MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; - PRODUCT_NAME = ElementX; + PRODUCT_NAME = "$(APP_NAME)"; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "ElementX/SupportingFiles/ElementX-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "GeneratedInterface-Swift.h"; @@ -4328,6 +4328,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; APP_GROUP_IDENTIFIER = "group.$(BASE_APP_GROUP_IDENTIFIER)"; + APP_NAME = ElementX; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = Colors/AccentColor; BASE_APP_GROUP_IDENTIFIER = io.element; BASE_BUNDLE_IDENTIFIER = io.element.elementx; @@ -4395,6 +4396,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; APP_GROUP_IDENTIFIER = "group.$(BASE_APP_GROUP_IDENTIFIER)"; + APP_NAME = ElementX; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = Colors/AccentColor; BASE_APP_GROUP_IDENTIFIER = io.element; BASE_BUNDLE_IDENTIFIER = io.element.elementx; @@ -4532,7 +4534,7 @@ ); MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; - PRODUCT_NAME = NSE; + PRODUCT_NAME = "$(APP_NAME)"; SDKROOT = iphoneos; SWIFT_OBJC_INTERFACE_HEADER_NAME = "GeneratedInterface-Swift.h"; TARGETED_DEVICE_FAMILY = "1,2"; From 847e38444ebfd8f53bfc54af5aaf79615ac7c731 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 26 May 2023 17:54:56 +0200 Subject: [PATCH 4/5] improvement --- ElementX.xcodeproj/project.pbxproj | 6 ++++-- NSE/SupportingFiles/Info.plist | 2 +- NSE/SupportingFiles/target.yml | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 966a6d1f06..f17c78af6b 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -4252,7 +4252,8 @@ ); MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; - PRODUCT_NAME = "$(APP_NAME)"; + PRODUCT_DISPLAY_NAME = "$(APP_NAME)"; + PRODUCT_NAME = NSE; SDKROOT = iphoneos; SWIFT_OBJC_INTERFACE_HEADER_NAME = "GeneratedInterface-Swift.h"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -4534,7 +4535,8 @@ ); MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; - PRODUCT_NAME = "$(APP_NAME)"; + PRODUCT_DISPLAY_NAME = "$(APP_NAME)"; + PRODUCT_NAME = NSE; SDKROOT = iphoneos; SWIFT_OBJC_INTERFACE_HEADER_NAME = "GeneratedInterface-Swift.h"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/NSE/SupportingFiles/Info.plist b/NSE/SupportingFiles/Info.plist index 48adae1ec0..4a96dacf45 100644 --- a/NSE/SupportingFiles/Info.plist +++ b/NSE/SupportingFiles/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - $(PRODUCT_NAME) + $(PRODUCT_DISPLAY_NAME) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/NSE/SupportingFiles/target.yml b/NSE/SupportingFiles/target.yml index 66dbe2c67a..3ad2c62452 100644 --- a/NSE/SupportingFiles/target.yml +++ b/NSE/SupportingFiles/target.yml @@ -40,7 +40,7 @@ targets: info: path: ../SupportingFiles/Info.plist properties: - CFBundleDisplayName: $(PRODUCT_NAME) + CFBundleDisplayName: $(PRODUCT_DISPLAY_NAME) CFBundleShortVersionString: $(MARKETING_VERSION) CFBundleVersion: $(CURRENT_PROJECT_VERSION) appGroupIdentifier: $(APP_GROUP_IDENTIFIER) @@ -52,7 +52,8 @@ targets: settings: base: - PRODUCT_NAME: $(APP_NAME) + PRODUCT_NAME: NSE + PRODUCT_DISPLAY_NAME: $(APP_NAME) PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.nse MARKETING_VERSION: $(MARKETING_VERSION) CURRENT_PROJECT_VERSION: $(CURRENT_PROJECT_VERSION) From 6128c1708e1ce854689a78ca82b22e71fef62b55 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 26 May 2023 17:58:28 +0200 Subject: [PATCH 5/5] changelog --- changelog.d/pr-965.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/pr-965.change diff --git a/changelog.d/pr-965.change b/changelog.d/pr-965.change new file mode 100644 index 0000000000..3bc6f8be23 --- /dev/null +++ b/changelog.d/pr-965.change @@ -0,0 +1 @@ +Showing the iOS default contact/group silhouette in notifications when the avatar is missing. \ No newline at end of file