Improve logging around sessions.

Author: charlesmchen-signal

AxolotlKit/Classes/SessionCipher.m

@@ -112,7 +112,7 @@ - (instancetype)initWithSessionStore:(id<SessionStore>)sessionStore
                                          recipientId:self.recipientId
                                            direction:TSMessageDirectionOutgoing
                                      protocolContext:protocolContext]) {
-        DDLogWarn(
+        OWSLogWarn(
             @"%@ Previously known identity key for while encrypting for recipient: %@", self.tag, self.recipientId);
         @throw [NSException exceptionWithName:UntrustedIdentityKeyException
                                        reason:@"There is a previously known identity key."
@@ -140,7 +140,8 @@ - (instancetype)initWithSessionStore:(id<SessionStore>)sessionStore
         PendingPreKey *items = [sessionState unacknowledgedPreKeyMessageItems];
         int localRegistrationId = [sessionState localRegistrationId];
 
-        DDLogInfo(@"Building PreKeyWhisperMessage for: %@ with preKeyId: %d", self.recipientId, items.preKeyId);
+        OWSLogInfo(@"Building PreKeyWhisperMessage for: %@.%lu with preKeyId: %d",
+                  self.recipientId, (unsigned long) self.deviceId, items.preKeyId);
 
         cipherMessage =
             [[PreKeyWhisperMessage alloc] init_throws_withWhisperMessage:cipherMessage
@@ -240,7 +241,7 @@ - (NSData *)throws_decryptWhisperMessage:(WhisperMessage *)whisperMessage protoc
                                          recipientId:self.recipientId
                                            direction:TSMessageDirectionIncoming
                                      protocolContext:protocolContext]) {
-        DDLogWarn(
+        OWSLogWarn(
             @"%@ Previously known identity key for while decrypting from recipient: %@", self.tag, self.recipientId);
         @throw [NSException exceptionWithName:UntrustedIdentityKeyException
                                        reason:@"There is a previously known identity key."
@@ -272,7 +273,7 @@ - (NSData *)throws_decryptWithSessionRecord:(SessionRecord *)sessionRecord
         NSData *decryptedData = [self throws_decryptWithSessionState:sessionState
                                                       whisperMessage:whisperMessage
                                                      protocolContext:protocolContext];
-        DDLogDebug(@"%@ successfully decrypted with current session state: %@", self.tag, sessionState);
+        OWSLogDebug(@"%@ successfully decrypted with current session state: %@", self.tag, sessionState);
         return decryptedData;
     }
     @catch (NSException *exception) {
@@ -293,7 +294,7 @@ - (NSData *)throws_decryptWithSessionRecord:(SessionRecord *)sessionRecord
                 decryptedData = [self throws_decryptWithSessionState:previousState
                                                       whisperMessage:whisperMessage
                                                      protocolContext:protocolContext];
-                DDLogInfo(@"%@ successfully decrypted with PREVIOUS session state: %@", self.tag, previousState);
+                OWSLogInfo(@"%@ successfully decrypted with PREVIOUS session state: %@", self.tag, previousState);
                 OWSAssert(decryptedData != nil);
                 stateToPromoteIdx = idx;
                 *stop = YES;
@@ -305,7 +306,7 @@ - (NSData *)throws_decryptWithSessionRecord:(SessionRecord *)sessionRecord
     if (decryptedData) {
         SessionState *sessionStateToPromote = [sessionRecord previousSessionStates][stateToPromoteIdx];
         OWSAssert(sessionStateToPromote != nil);
-        DDLogInfo(@"%@ promoting session: %@", self.tag, sessionStateToPromote);
+        OWSLogInfo(@"%@ promoting session: %@", self.tag, sessionStateToPromote);
         [[sessionRecord previousSessionStates] removeObjectAtIndex:stateToPromoteIdx];
         [sessionRecord promoteState:sessionStateToPromote];
 
@@ -314,7 +315,7 @@ - (NSData *)throws_decryptWithSessionRecord:(SessionRecord *)sessionRecord
 
     BOOL containsActiveSession =
         [self.sessionStore containsSession:self.recipientId deviceId:self.deviceId protocolContext:protocolContext];
-    DDLogError(@"%@ No valid session for recipient: %@.%lu containsActiveSession: %@, previousStates: %lu",
+    OWSLogError(@"%@ No valid session for recipient: %@.%lu containsActiveSession: %@, previousStates: %lu",
         self.tag,
         self.recipientId,
         (unsigned long) self.deviceId,
@@ -386,10 +387,10 @@ - (ChainKey *)throws_getOrCreateChainKeys:(SessionState *)sessionState theirEphe
 
     @try {
         if ([sessionState hasReceiverChain:theirEphemeral]) {
-            DDLogInfo(@"%@ %@.%d has existing receiver chain.", self.tag, self.recipientId, self.deviceId);
+            OWSLogInfo(@"%@ %@.%d has existing receiver chain.", self.tag, self.recipientId, self.deviceId);
             return [sessionState receiverChainKey:theirEphemeral];
         } else{
-            DDLogInfo(@"%@ %@.%d creating new chains.", self.tag, self.recipientId, self.deviceId);
+            OWSLogInfo(@"%@ %@.%d creating new chains.", self.tag, self.recipientId, self.deviceId);
             RootKey *rootKey = [sessionState rootKey];
             OWSAssert(rootKey.keyData.length == 32);