Use precompiled resource bundle to work around FB7425571

ChatSecure.xcodeproj/project.pbxproj

@@ -59,8 +59,7 @@
 		D93EFA8E235971E2007474EC /* Purchase.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D93EFA8D235971E2007474EC /* Purchase.storyboard */; };
 		D95AD2291B684AE1007DEBC3 /* xmpp-server-list in Resources */ = {isa = PBXBuildFile; fileRef = D95AD2281B684AE1007DEBC3 /* xmpp-server-list */; };
 		D97070921EEF382D004FEBDE /* MediaDownloadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D97070911EEF382D004FEBDE /* MediaDownloadView.xib */; };
-		D97579FA236F5D9E0038B025 /* CPAProxy.bundle in Embed PlugIns */ = {isa = PBXBuildFile; fileRef = D9B7EEED235D476700AD1EEA /* CPAProxy.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D97579FC236F5DA20038B025 /* OTRResources.bundle in Embed PlugIns */ = {isa = PBXBuildFile; fileRef = D93027561BAA381F000CC975 /* OTRResources.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D9757A04236F700D0038B025 /* OTRResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D9757A02236F6FAC0038B025 /* OTRResources.bundle */; };
 		D985BC7A1EBD32F700993D27 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D985BC791EBD32F700993D27 /* StoreKit.framework */; };
 		D98BA36C1EDE47BB004475B6 /* HTMLPreviewView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D98BA36B1EDE47BB004475B6 /* HTMLPreviewView.xib */; };
 		D99F17861BAB932800604558 /* OTRImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D9AE3A231BA8D02800255537 /* OTRImages.xcassets */; };
@@ -482,20 +481,6 @@
 			remoteGlobalIDString = 6396AF991A169D54009F3E6C;
 			remoteInfo = ChatSecure;
 		};
-		D90DA4EF236F3C1400C585B7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6396AF921A169D54009F3E6C /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D93027551BAA381F000CC975;
-			remoteInfo = OTRResources;
-		};
-		D97579FD236F5DA20038B025 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6396AF921A169D54009F3E6C /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D93027551BAA381F000CC975;
-			remoteInfo = OTRResources;
-		};
 		D9B7EEE6235D476700AD1EEA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D9B7EEDF235D476700AD1EEA /* CPAProxy.xcodeproj */;
@@ -568,21 +553,6 @@
 		};
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		D97579FB236F5D9E0038B025 /* Embed PlugIns */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 7;
-			files = (
-				D97579FA236F5D9E0038B025 /* CPAProxy.bundle in Embed PlugIns */,
-				D97579FC236F5DA20038B025 /* OTRResources.bundle in Embed PlugIns */,
-			);
-			name = "Embed PlugIns";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		02700BD14C69C0E5B88BB7B8 /* Pods-ChatSecureCorePods-ChatSecure.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChatSecureCorePods-ChatSecure.release.xcconfig"; path = "Target Support Files/Pods-ChatSecureCorePods-ChatSecure/Pods-ChatSecureCorePods-ChatSecure.release.xcconfig"; sourceTree = "<group>"; };
 		0F10D8D68EF9105245CE0D9F /* Pods-ChatSecureCorePods-ChatSecureCore.release (mac).xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChatSecureCorePods-ChatSecureCore.release (mac).xcconfig"; path = "Target Support Files/Pods-ChatSecureCorePods-ChatSecureCore/Pods-ChatSecureCorePods-ChatSecureCore.release (mac).xcconfig"; sourceTree = "<group>"; };
@@ -702,6 +672,7 @@
 		D95AD2281B684AE1007DEBC3 /* xmpp-server-list */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "xmpp-server-list"; path = "Submodules/xmpp-server-list"; sourceTree = SOURCE_ROOT; };
 		D97070911EEF382D004FEBDE /* MediaDownloadView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MediaDownloadView.xib; path = Interface/MediaDownloadView.xib; sourceTree = "<group>"; };
 		D973D7051A2D4094004D353E /* Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist"; path = "Pods/Target Support Files/Pods-ChatSecureCorePods-ChatSecure/Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist"; sourceTree = SOURCE_ROOT; };
+		D9757A02236F6FAC0038B025 /* OTRResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = OTRResources.bundle; sourceTree = "<group>"; };
 		D985BC791EBD32F700993D27 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		D98BA36B1EDE47BB004475B6 /* HTMLPreviewView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = HTMLPreviewView.xib; path = Interface/HTMLPreviewView.xib; sourceTree = "<group>"; };
 		D99F17891BAB946800604558 /* Branding.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Branding.plist; sourceTree = "<group>"; };
@@ -1310,6 +1281,7 @@
 		D93027571BAA381F000CC975 /* OTRResources */ = {
 			isa = PBXGroup;
 			children = (
+				D9757A02236F6FAC0038B025 /* OTRResources.bundle */,
 				D93EFA8D235971E2007474EC /* Purchase.storyboard */,
 				D93EFA7A23596BC9007474EC /* OMEMODeviceFingerprintCell.xib */,
 				D93EFA7723596BC9007474EC /* OTRComposeGroupBuddyCell.xib */,
@@ -2148,14 +2120,11 @@
 				6396AF981A169D54009F3E6C /* Resources */,
 				D92F96D821BA1E7A0056EA35 /* LicensePlist */,
 				7252D7AF431B6401569E9D58 /* [CP] Copy Pods Resources */,
-				D97579FB236F5D9E0038B025 /* Embed PlugIns */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				D9C52806235CB55C002B213A /* PBXTargetDependency */,
-				D90DA4F0236F3C1400C585B7 /* PBXTargetDependency */,
-				D97579FE236F5DA20038B025 /* PBXTargetDependency */,
 			);
 			name = ChatSecure;
 			productName = ChatSecure;
@@ -2400,6 +2369,7 @@
 				635EF2021E276C410087BD72 /* Localizable.strings in Resources */,
 				D9DEC34A1FABC9F900BF1F7C /* Settings.bundle in Resources */,
 				D9ECD08F2344626800ECE5F9 /* LaunchScreen.storyboard in Resources */,
+				D9757A04236F700D0038B025 /* OTRResources.bundle in Resources */,
 				6331072C1A16D1F200C17BAE /* Images.xcassets in Resources */,
 				D9365E7A1A1EB0050006434A /* torrc in Resources */,
 				6331072B1A16D1F200C17BAE /* DemoImages.xcassets in Resources */,
@@ -2903,16 +2873,6 @@
 			target = 6396AF991A169D54009F3E6C /* ChatSecure */;
 			targetProxy = 6365CF011E2453F6009E213F /* PBXContainerItemProxy */;
 		};
-		D90DA4F0236F3C1400C585B7 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D93027551BAA381F000CC975 /* OTRResources */;
-			targetProxy = D90DA4EF236F3C1400C585B7 /* PBXContainerItemProxy */;
-		};
-		D97579FE236F5DA20038B025 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D93027551BAA381F000CC975 /* OTRResources */;
-			targetProxy = D97579FD236F5DA20038B025 /* PBXContainerItemProxy */;
-		};
 		D9B7EEF8235D47A000AD1EEA /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "OTRKit (iOS)";
@@ -3158,7 +3118,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 154;
+				CURRENT_PROJECT_VERSION = 155;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
@@ -3196,7 +3156,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 154;
+				CURRENT_PROJECT_VERSION = 155;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;

OTRResources/Branding.plist

@@ -43,7 +43,7 @@
 	<key>AllowsDonation</key>
 	<true/>
 	<key>TorEnabled</key>
-	<true/>
+	<false/>
 	<key>AllowGroupOMEMO</key>
 	<true/>
 	<key>AllowDebugFileLogging</key>