From 234a2827b370ac4472374b01b88bd32d2defb4a3 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 25 Jun 2019 16:17:05 +1000
Subject: [PATCH] Fix release issues

---
 Signal.xcodeproj/project.pbxproj                     | 12 ++++++------
 .../xcshareddata/xcschemes/Signal.xcscheme           |  2 +-
 Signal/Signal-Info.plist                             |  4 ++++
 Signal/src/AppDelegate.m                             |  2 +-
 .../src/Messages/Interactions/TSOutgoingMessage.m    |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 16097d322..261972a16 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -2913,7 +2913,7 @@
 				TargetAttributes = {
 					453518671FC635DD00210559 = {
 						CreatedOnToolsVersion = 9.2;
-						DevelopmentTeam = 8SQ45X653X;
+						DevelopmentTeam = SUQ8J2PCT7;
 						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
@@ -2933,7 +2933,7 @@
 					};
 					453518911FC63DBF00210559 = {
 						CreatedOnToolsVersion = 9.2;
-						DevelopmentTeam = 8SQ45X653X;
+						DevelopmentTeam = SUQ8J2PCT7;
 						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
@@ -3951,7 +3951,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = 8SQ45X653X;
+				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -4011,7 +4011,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 8SQ45X653X;
+				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -4065,7 +4065,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 8SQ45X653X;
+				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -4133,7 +4133,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 8SQ45X653X;
+				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index f080c2943..04df5b5a4 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -133,7 +133,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "App Store Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableThreadSanitizer = "YES"
diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 780052105..4b5036979 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -6,10 +6,14 @@
 	<dict>
 		<key>CarthageVersion</key>
 		<string>0.33.0</string>
+		<key>DateTime</key>
+		<string>Tue Jun 25 06:15:45 UTC 2019</string>
 		<key>OSXVersion</key>
 		<string>10.14.5</string>
 		<key>WebRTCCommit</key>
 		<string>1445d719bf05280270e9f77576f80f973fd847f8 M73</string>
+		<key>XCodeVersion</key>
+		<string>1000.1020</string>
 	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 6defdcd57..37ceb85bf 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -1411,7 +1411,7 @@ static NSTimeInterval launchStartedAt;
     NSLog(@"[Loki] Received %lu messages through long polling.", messages.count);
 
     for (SSKProtoEnvelope *envelope in messages) {
-        NSData *envelopeData = envelope.serializedDataIgnoringErrors;
+        NSData *envelopeData = [envelope serializedDataAndReturnError:nil];
         if (envelopeData != nil) {
             [SSKEnvironment.shared.messageReceiver handleReceivedEnvelopeData:envelopeData];
         } else {
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index ed9307e85..283b00f89 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -1109,7 +1109,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt
         SSKProtoDataMessageLokiProfileBuilder *profileBuilder = [SSKProtoDataMessageLokiProfile builder];
         [profileBuilder setDisplayName:displayName];
         
-        SSKProtoDataMessageLokiProfile *profile = [profileBuilder buildIgnoringErrors];
+        SSKProtoDataMessageLokiProfile *profile = [profileBuilder buildAndReturnError:nil];
         [builder setProfile:profile];
     }