Merge branch 'charlesmchen/logOverflow'

src/Contacts/TSThread.m

@@ -289,7 +289,6 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(interaction);
 
     if (interaction.isDynamicInteraction) {
-        DDLogDebug(@"%@ not showing dynamic interaction in inbox: %@", self.tag, interaction.debugDescription);
         return NO;
     }
 
@@ -298,15 +297,11 @@ NS_ASSUME_NONNULL_BEGIN
         if (errorMessage.errorType == TSErrorMessageNonBlockingIdentityChange) {
             // Otherwise all group threads with the recipient will percolate to the top of the inbox, even though
             // there was no meaningful interaction.
-            DDLogDebug(
-                @"%@ not showing nonblocking identity change in inbox: %@", self.tag, errorMessage.debugDescription);
             return NO;
         }
     } else if ([interaction isKindOfClass:[TSInfoMessage class]]) {
         TSInfoMessage *infoMessage = (TSInfoMessage *)interaction;
         if (infoMessage.messageType == TSInfoMessageVerificationStateChange) {
-            DDLogDebug(
-                @"%@ not showing verification state change in inbox: %@", self.tag, infoMessage.debugDescription);
             return NO;
         }
     }

src/Messages/Interactions/TSErrorMessage.m

@@ -180,7 +180,7 @@ NSUInteger TSErrorMessageSchemaVersion = 1;
         return;
     }
 
-    DDLogInfo(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
+    DDLogDebug(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
     _read = YES;
     [self saveWithTransaction:transaction];
     [self touchThreadWithTransaction:transaction];

src/Messages/Interactions/TSIncomingMessage.m

@@ -127,7 +127,7 @@ NSString *const TSIncomingMessageWasReadOnThisDeviceNotification = @"TSIncomingM
         return;
     }
 
-    DDLogInfo(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
+    DDLogDebug(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
     _read = YES;
     [self saveWithTransaction:transaction];
     [self touchThreadWithTransaction:transaction];

src/Messages/Interactions/TSInfoMessage.m

@@ -119,7 +119,7 @@ NSUInteger TSInfoMessageSchemaVersion = 1;
         return;
     }
 
-    DDLogInfo(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
+    DDLogDebug(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
     _read = YES;
     [self saveWithTransaction:transaction];
     [self touchThreadWithTransaction:transaction];

src/Messages/TSCall.m

@@ -96,7 +96,7 @@ NSUInteger TSCallCurrentSchemaVersion = 1;
         return;
     }
 
-    DDLogInfo(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
+    DDLogDebug(@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.tag, self.uniqueId, self.timestamp);
     _read = YES;
     [self saveWithTransaction:transaction];
     [self touchThreadWithTransaction:transaction];

src/Network/WebSockets/TSSocketManager.m

@@ -234,7 +234,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
         return;
     }
 
-    DDLogWarn(@"%@ Socket state change: %@ -> %@",
+    DDLogWarn(@"%@ Socket state: %@ -> %@",
         self.tag,
         [self stringFromSocketManagerState:_state],
         [self stringFromSocketManagerState:state]);