From 957979585ceebe3db837fe5c0c95662ad54f638f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 10 Jul 2017 11:52:22 -0500 Subject: [PATCH] remove unhelpful logging // FREEBIE --- src/Contacts/PhoneNumber.m | 1 - src/Messages/OWSIdentityManager.m | 5 ----- src/Messages/OWSMessageSender.m | 10 ++-------- src/Network/OWSSignalService.m | 1 - src/Network/WebSockets/TSSocketManager.m | 1 - src/Util/Cryptography.m | 2 -- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/Contacts/PhoneNumber.m b/src/Contacts/PhoneNumber.m index 39e1a68ff..d914221d4 100644 --- a/src/Contacts/PhoneNumber.m +++ b/src/Contacts/PhoneNumber.m @@ -22,7 +22,6 @@ static NSString *const RPDefaultsKeyPhoneNumberCanonical = @"RPDefaultsKeyPhoneN NBPhoneNumber *number = [phoneUtil parse:text defaultRegion:regionCode error:&parseError]; if (parseError) { - DDLogDebug(@"Issue while parsing number: %@", [parseError description]); return nil; } diff --git a/src/Messages/OWSIdentityManager.m b/src/Messages/OWSIdentityManager.m index ca0e87076..e71da5174 100644 --- a/src/Messages/OWSIdentityManager.m +++ b/src/Messages/OWSIdentityManager.m @@ -207,7 +207,6 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa return YES; } - DDLogDebug(@"%@ no changes for identity saved for recipient: %@", self.tag, recipientId); return NO; } } @@ -365,7 +364,6 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa @synchronized(self) { if (recipientIdentity == nil) { - DDLogDebug(@"%@ Trusting previously unknown recipient: %@", self.tag, recipientIdentity.recipientId); return YES; } @@ -376,7 +374,6 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa } if ([recipientIdentity isFirstKnownKey]) { - DDLogDebug(@"%@ trusting first known key for recipient: %@", self.tag, recipientIdentity.recipientId); return YES; } @@ -388,12 +385,10 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa DDLogWarn(@"%@ not trusting new identity for recipient: %@", self.tag, recipientIdentity.recipientId); return NO; } else { - DDLogWarn(@"%@ trusting existing identity for recipient: %@", self.tag, recipientIdentity.recipientId); return YES; } } case OWSVerificationStateVerified: - DDLogWarn(@"%@ trusting verified identity for recipient: %@", self.tag, recipientIdentity.recipientId); return YES; case OWSVerificationStateNoLongerVerified: DDLogWarn(@"%@ not trusting no longer verified identity for recipient: %@", self.tag, recipientIdentity.recipientId); diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m index f29cc016a..b931f1b62 100644 --- a/src/Messages/OWSMessageSender.m +++ b/src/Messages/OWSMessageSender.m @@ -192,7 +192,6 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4; [message updateWithMessageState:TSOutgoingMessageStateSentToService]; - DDLogDebug(@"%@ succeeded.", strongSelf.tag); aSuccessHandler(); [strongSelf markAsComplete]; @@ -281,12 +280,10 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4; - (void)tryWithRemainingRetries:(NSUInteger)remainingRetries { - DDLogDebug(@"%@ remainingRetries: %lu", self.tag, (unsigned long)remainingRetries); - // Use this flag to ensure a given operation only succeeds or fails once. __block BOOL onceFlag = NO; RetryableFailureHandler retryableFailureHandler = ^(NSError *_Nonnull error) { - DDLogInfo(@"%@ Sending failed.", self.tag); + DDLogInfo(@"%@ Sending failed. Remaining retries: %lu", self.tag, (unsigned long)remainingRetries); OWSAssert(!onceFlag); onceFlag = YES; @@ -450,8 +447,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; success:(void (^)())successHandler failure:(RetryableFailureHandler)failureHandler { - DDLogDebug(@"%@ sending message: %@", self.tag, message.debugDescription); - [self ensureAnyAttachmentsUploaded:message success:^() { [self deliverMessage:message @@ -472,7 +467,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; failure:(RetryableFailureHandler)failureHandler { if (!message.hasAttachments) { - DDLogDebug(@"%@ No attachments for message: %@", self.tag, message); return successHandler(); } @@ -1169,7 +1163,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; NSMutableArray *messagesArray = [NSMutableArray arrayWithCapacity:recipient.devices.count]; NSData *plainText = [message buildPlainTextData]; - DDLogDebug(@"%@ message: %@ plainTextData.length: %lu", self.tag, [message class], plainText.length); + DDLogDebug(@"%@ built message: %@ plainTextData.length: %lu", self.tag, [message class], plainText.length); for (NSNumber *deviceNumber in recipient.devices) { @try { diff --git a/src/Network/OWSSignalService.m b/src/Network/OWSSignalService.m index 5c41a0128..1cf1bd035 100644 --- a/src/Network/OWSSignalService.m +++ b/src/Network/OWSSignalService.m @@ -160,7 +160,6 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = DDLogInfo(@"%@ using reflector HTTPSessionManager", self.tag); return self.reflectorHTTPSessionManager; } else { - DDLogDebug(@"%@ using default HTTPSessionManager", self.tag); return self.defaultHTTPSessionManager; } } diff --git a/src/Network/WebSockets/TSSocketManager.m b/src/Network/WebSockets/TSSocketManager.m index 27ba199ff..fae1b53cc 100644 --- a/src/Network/WebSockets/TSSocketManager.m +++ b/src/Network/WebSockets/TSSocketManager.m @@ -156,7 +156,6 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_ if (self.websocket) { switch ([self.websocket readyState]) { case SR_OPEN: - DDLogVerbose(@"WebSocket already open on connection request"); self.state = SocketManagerStateOpen; return; case SR_CONNECTING: diff --git a/src/Util/Cryptography.m b/src/Util/Cryptography.m index 955117d24..650c604c5 100755 --- a/src/Util/Cryptography.m +++ b/src/Util/Cryptography.m @@ -153,8 +153,6 @@ NS_ASSUME_NONNULL_BEGIN DDLogWarn(@"%@ Bad digest on decrypting payload. Their digest: %@, our digest: %@", self.tag, digest, ourDigest); return nil; } - } else { - DDLogVerbose(@"%@ %s no digest to verify", self.tag, __PRETTY_FUNCTION__); } // decrypt