Merge branch 'charlesmchen/smallUDTweaks' into release/2.31.0

SignalServiceKit/src/Messages/OWSMessageSend.swift

@@ -83,13 +83,13 @@ public class OWSMessageSend: NSObject {
 
     @objc
     public func disableUD() {
-        Logger.verbose("")
+        Logger.verbose("\(recipient.recipientId)")
         udAccessKey = nil
     }
 
     @objc
     public func setHasUDAuthFailed() {
-        Logger.verbose("")
+        Logger.verbose("\(recipient.recipientId)")
         // We "fail over" to non-UD sends after auth errors sending via UD.
         disableUD()
     }

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -1139,7 +1139,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
 
     SignalRecipient *recipient = messageSend.recipient;
 
-    OWSLogInfo(@"Message send succeeded.");
+    OWSLogInfo(@"Message send succeeded (wasSentByUD: %d).", wasSentByUD);
 
     if (messageSend.isLocalNumber && deviceMessages.count == 0) {
         OWSLogInfo(@"Sent a message with no device messages; clearing 'mayHaveLinkedDevices'.");

SignalServiceKit/src/Messages/UD/OWSUDManager.swift

@@ -240,7 +240,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
                 return nil
             }
         }
-        let accessMode = unidentifiedAccessMode(forRecipientId: localNumber)
+        let accessMode = unidentifiedAccessMode(forRecipientId: recipientId)
         if accessMode == .unrestricted {
             if isUDVerboseLoggingEnabled() {
                 Logger.info("UD Send enabled for \(recipientId) with random key.")