fix extension plist build issues

mcginty · mcginty · commit cb51bfeb7952 · 2026-03-10T15:01:03.000-05:00
diff --git a/packages/mobile/ios/Quiet.xcodeproj/project.pbxproj b/packages/mobile/ios/Quiet.xcodeproj/project.pbxproj
@@ -657,24 +657,24 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		EB4DC8012F608A3300EFD23F /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		EB611A772F60ADD1000CA1A2 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				Info.plist,
+				KeychainHelper.swift,
 			);
-			target = EB4DC7F82F608A3300EFD23F /* QuietNotificationServiceExtension */;
+			target = 13B07F861A680F5B00A75B9A /* Quiet */;
 		};
-		EB4DC80B2F608B3A00EFD23F /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		EBE628BC2F60AFB00062530D /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				KeychainHelper.swift,
+				Info.plist,
 			);
-			target = 13B07F861A680F5B00A75B9A /* Quiet */;
+			target = EB4DC7F82F608A3300EFD23F /* QuietNotificationServiceExtension */;
 		};
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		EB4DC7FA2F608A3300EFD23F /* QuietNotificationServiceExtension */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (EB4DC80B2F608B3A00EFD23F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, EB4DC8012F608A3300EFD23F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = QuietNotificationServiceExtension; sourceTree = "<group>"; };
+		EB4DC7FA2F608A3300EFD23F /* QuietNotificationServiceExtension */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (EB611A772F60ADD1000CA1A2 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, EBE628BC2F60AFB00062530D /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = QuietNotificationServiceExtension; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -5777,7 +5777,7 @@
 				DEVELOPMENT_TEAM = XG66F95CNS;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = QuietNotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = QuietNotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -5825,7 +5825,7 @@
 				DEVELOPMENT_TEAM = CTYKSWN9T4;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = QuietNotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = QuietNotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
diff --git a/packages/mobile/ios/Quiet/FirebaseMessagingModule.swift b/packages/mobile/ios/Quiet/FirebaseMessagingModule.swift
@@ -4,21 +4,21 @@ import FirebaseMessaging
 
 @objc(FirebaseMessagingModule)
 class FirebaseMessagingModule: RCTEventEmitter {
-    
+
     static let FCM_TOKEN_RECEIVED = "fcmTokenReceived"
     static let FCM_TOKEN_REFRESHED = "fcmTokenRefreshed"
-    
+
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
-    
+
     override func supportedEvents() -> [String]! {
         return [
             FirebaseMessagingModule.FCM_TOKEN_RECEIVED,
             FirebaseMessagingModule.FCM_TOKEN_REFRESHED
         ]
     }
-    
+
     @objc
     func getToken(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         Messaging.messaging().token { token, error in
@@ -31,7 +31,7 @@ class FirebaseMessagingModule: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc
     func deleteToken(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         Messaging.messaging().deleteToken { error in
@@ -42,7 +42,7 @@ class FirebaseMessagingModule: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc
     func subscribeToTopic(_ topic: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         Messaging.messaging().subscribe(toTopic: topic) { error in
@@ -53,7 +53,7 @@ class FirebaseMessagingModule: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc
     func unsubscribeFromTopic(_ topic: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         Messaging.messaging().unsubscribe(fromTopic: topic) { error in
@@ -64,18 +64,9 @@ class FirebaseMessagingModule: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc
     func setEncryptionKey(_ key: String) {
-        guard let keyData = key.data(using: .utf8) else {
-            print("Error: Invalid encryption key format")
-            return
-        }
-        KeychainHelper.shared.save(
-            service: "com.quiet.notifications",
-            account: "encryptionKey",
-            data: keyData
-        )
     }
     
     @objc

Original file line number	Diff line number	Diff line change
`@@ -4,21 +4,21 @@ import FirebaseMessaging`
`4`	`4`
`5`	`5`	`@objc(FirebaseMessagingModule)`
`6`	`6`	`class FirebaseMessagingModule: RCTEventEmitter {`
`7`		`-`
	`7`	`+`
`8`	`8`	`static let FCM_TOKEN_RECEIVED = "fcmTokenReceived"`
`9`	`9`	`static let FCM_TOKEN_REFRESHED = "fcmTokenRefreshed"`
`10`		`-`
	`10`	`+`
`11`	`11`	`override static func requiresMainQueueSetup() -> Bool {`
`12`	`12`	`return true`
`13`	`13`	`}`
`14`		`-`
	`14`	`+`
`15`	`15`	`override func supportedEvents() -> [String]! {`
`16`	`16`	`return [`
`17`	`17`	`FirebaseMessagingModule.FCM_TOKEN_RECEIVED,`
`18`	`18`	`FirebaseMessagingModule.FCM_TOKEN_REFRESHED`
`19`	`19`	`]`
`20`	`20`	`}`
`21`		`-`
	`21`	`+`
`22`	`22`	`@objc`
`23`	`23`	`func getToken(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {`
`24`	`24`	`Messaging.messaging().token { token, error in`
`@@ -31,7 +31,7 @@ class FirebaseMessagingModule: RCTEventEmitter {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`34`		`-`
	`34`	`+`
`35`	`35`	`@objc`
`36`	`36`	`func deleteToken(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {`
`37`	`37`	`Messaging.messaging().deleteToken { error in`
`@@ -42,7 +42,7 @@ class FirebaseMessagingModule: RCTEventEmitter {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`-`
	`45`	`+`
`46`	`46`	`@objc`
`47`	`47`	`func subscribeToTopic(_ topic: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {`
`48`	`48`	`Messaging.messaging().subscribe(toTopic: topic) { error in`
`@@ -53,7 +53,7 @@ class FirebaseMessagingModule: RCTEventEmitter {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
`56`		`-`
	`56`	`+`
`57`	`57`	`@objc`
`58`	`58`	`func unsubscribeFromTopic(_ topic: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {`
`59`	`59`	`Messaging.messaging().unsubscribe(fromTopic: topic) { error in`
`@@ -64,18 +64,9 @@ class FirebaseMessagingModule: RCTEventEmitter {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`-`
	`67`	`+`
`68`	`68`	`@objc`
`69`	`69`	`func setEncryptionKey(_ key: String) {`
`70`		`- guard let keyData = key.data(using: .utf8) else {`
`71`		`- print("Error: Invalid encryption key format")`
`72`		`- return`
`73`		`- }`
`74`		`- KeychainHelper.shared.save(`
`75`		`- service: "com.quiet.notifications",`
`76`		`- account: "encryptionKey",`
`77`		`- data: keyData`
`78`		`- )`
`79`	`70`	`}`
`80`	`71`
`81`	`72`	`@objc`