From c432af93dc84521b466f433408586b339e98c56f Mon Sep 17 00:00:00 2001 From: gmbnt Date: Tue, 7 Apr 2020 10:04:59 +1000 Subject: [PATCH] Fix notification service extension bug --- LokiPushNotificationService/Info.plist | 2 +- ...onService.swift => NotificationServiceExtension.swift} | 4 ++-- Signal.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) rename LokiPushNotificationService/{NotificationService.swift => NotificationServiceExtension.swift} (98%) diff --git a/LokiPushNotificationService/Info.plist b/LokiPushNotificationService/Info.plist index 79c07807b..a437c8b72 100644 --- a/LokiPushNotificationService/Info.plist +++ b/LokiPushNotificationService/Info.plist @@ -25,7 +25,7 @@ NSExtensionPointIdentifier com.apple.usernotifications.service NSExtensionPrincipalClass - $(PRODUCT_MODULE_NAME).NotificationService + $(PRODUCT_MODULE_NAME).NotificationServiceExtension diff --git a/LokiPushNotificationService/NotificationService.swift b/LokiPushNotificationService/NotificationServiceExtension.swift similarity index 98% rename from LokiPushNotificationService/NotificationService.swift rename to LokiPushNotificationService/NotificationServiceExtension.swift index d105fe087..af769bded 100644 --- a/LokiPushNotificationService/NotificationService.swift +++ b/LokiPushNotificationService/NotificationServiceExtension.swift @@ -2,7 +2,7 @@ import UserNotifications import SignalServiceKit import SignalMessaging -final class NotificationService : UNNotificationServiceExtension { +final class NotificationServiceExtension : UNNotificationServiceExtension { static let isFromRemoteKey = "remote" static let threadIdKey = "Signal.AppNotificationsUserInfoKey.threadId" @@ -67,7 +67,7 @@ final class NotificationService : UNNotificationServiceExtension { groupType: oldGroupModel.groupType, adminIds: group.admins) removeMembers.subtract(Set(arrayLiteral: newGroupModel.groupMemberIds)) - newGroupModel.removedMembers = removeMembers as! NSMutableSet + newGroupModel.removedMembers = NSMutableSet(set: removeMembers) switch contentProto?.dataMessage?.group?.type { case .update: newNotificationBody = oldGroupModel.getInfoStringAboutUpdate(to: newGroupModel, contactsManager: SSKEnvironment.shared.contactsManager) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 0260d80f9..e0ce73355 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -520,7 +520,7 @@ 768A1A2B17FC9CD300E00ED8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 768A1A2A17FC9CD300E00ED8 /* libz.dylib */; }; 76C87F19181EFCE600C4ACAB /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76C87F18181EFCE600C4ACAB /* MediaPlayer.framework */; }; 76EB054018170B33006006FC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB03C318170B33006006FC /* AppDelegate.m */; }; - 7BC01A3E241F40AB00BC7C55 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC01A3D241F40AB00BC7C55 /* NotificationService.swift */; }; + 7BC01A3E241F40AB00BC7C55 /* NotificationServiceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BC01A3D241F40AB00BC7C55 /* NotificationServiceExtension.swift */; }; 7BC01A42241F40AB00BC7C55 /* LokiPushNotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7BC01A3B241F40AB00BC7C55 /* LokiPushNotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 7BDCFC08242186E700641C39 /* NotificationServiceExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BDCFC07242186E700641C39 /* NotificationServiceExtensionContext.swift */; }; 7BDCFC092421894900641C39 /* MessageFetcherJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452ECA4C1E087E7200E2F016 /* MessageFetcherJob.swift */; }; @@ -1360,7 +1360,7 @@ 76EB03C218170B33006006FC /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 76EB03C318170B33006006FC /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 7BC01A3B241F40AB00BC7C55 /* LokiPushNotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = LokiPushNotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - 7BC01A3D241F40AB00BC7C55 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; + 7BC01A3D241F40AB00BC7C55 /* NotificationServiceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationServiceExtension.swift; sourceTree = ""; }; 7BC01A3F241F40AB00BC7C55 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7BDCFC0424206E7300641C39 /* LokiPushNotificationService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LokiPushNotificationService.entitlements; sourceTree = ""; }; 7BDCFC07242186E700641C39 /* NotificationServiceExtensionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationServiceExtensionContext.swift; sourceTree = ""; }; @@ -2633,7 +2633,7 @@ children = ( 7BDCFC07242186E700641C39 /* NotificationServiceExtensionContext.swift */, 7BDCFC0424206E7300641C39 /* LokiPushNotificationService.entitlements */, - 7BC01A3D241F40AB00BC7C55 /* NotificationService.swift */, + 7BC01A3D241F40AB00BC7C55 /* NotificationServiceExtension.swift */, 7BC01A3F241F40AB00BC7C55 /* Info.plist */, ); path = LokiPushNotificationService; @@ -3988,7 +3988,7 @@ buildActionMask = 2147483647; files = ( 7BDCFC08242186E700641C39 /* NotificationServiceExtensionContext.swift in Sources */, - 7BC01A3E241F40AB00BC7C55 /* NotificationService.swift in Sources */, + 7BC01A3E241F40AB00BC7C55 /* NotificationServiceExtension.swift in Sources */, 7BDCFC092421894900641C39 /* MessageFetcherJob.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0;