From bf8d694eb4745337b3dfeafc881d5836c1468db8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 23 Oct 2017 12:40:51 -0400 Subject: [PATCH] Rework attachment approval UI. // FREEBIE --- Signal.xcodeproj/project.pbxproj | 6 +++++- .../src/Messages/Interactions/TSOutgoingMessage.m | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index e12e9fd99..34f3e1ede 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2561,7 +2561,11 @@ "DEBUG=1", "$(inherited)", ); - "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DEBUG=1 $(inherited) SSK_BUILDING_FOR_TESTS=1"; + "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = ( + "DEBUG=1", + "$(inherited)", + "SSK_BUILDING_FOR_TESTS=1", + ); GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 46ea0aaea..936ac699a 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -200,9 +200,6 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec - (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction { - DDLogError(@"%@ %zd %@", self.tag, self.attachmentIds.count, self.attachmentIds.firstObject); - [DDLog flushLog]; - if (!(self.groupMetaMessage == TSGroupMessageDeliver || self.groupMetaMessage == TSGroupMessageNone)) { DDLogDebug(@"%@ Skipping save for group meta message.", self.tag); return;