From 302da6601780eb25e55f893f6774cb1ab0b7e224 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 26 Oct 2018 17:21:23 -0400
Subject: [PATCH 1/2] Fix UD access logic.

---
 SignalServiceKit/src/Messages/UD/OWSUDManager.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift
index 092a73d34..22ab6a428 100644
--- a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift
+++ b/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.")

From 33f0a32e59ff3fd96507b427ae458df3e04639a6 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 26 Oct 2018 17:21:49 -0400
Subject: [PATCH 2/2] Improve UD logging.

---
 SignalServiceKit/src/Messages/OWSMessageSend.swift | 4 ++--
 SignalServiceKit/src/Messages/OWSMessageSender.m   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SignalServiceKit/src/Messages/OWSMessageSend.swift b/SignalServiceKit/src/Messages/OWSMessageSend.swift
index 5dc9e8b22..29b7f8b2c 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSend.swift
+++ b/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()
     }
diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 65899936e..9f8769425 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/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'.");