From c28d131f970441ab1a6bdc8e6ce97b0eedb935c6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 30 Oct 2018 14:02:23 -0400 Subject: [PATCH] Respond to CR. --- .../src/Messages/UD/OWSUDManager.swift | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift index 23b3dcf2b..8fa6666cf 100644 --- a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift +++ b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift @@ -276,18 +276,11 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { if accessMode == .unrestricted { // Unrestricted users should use a derived key if possible, // and fall back to a random key otherwise. - if let udAccessKey = udAccessKey(forRecipientId: recipientId) { - if isUDVerboseLoggingEnabled() { - Logger.info("UD Send enabled for \(recipientId) with unverified key.") - } - return OWSUDAccess(udAccessKey: udAccessKey, udAccessMode: accessMode, isRandomKey: false) - } else { - if isUDVerboseLoggingEnabled() { - Logger.info("UD Send enabled for \(recipientId) with random key.") - } - let udAccessKey = randomUDAccessKey() - return OWSUDAccess(udAccessKey: udAccessKey, udAccessMode: accessMode, isRandomKey: true) + if isUDVerboseLoggingEnabled() { + Logger.info("UD Send enabled for \(recipientId) with random key.") } + let udAccessKey = randomUDAccessKey() + return OWSUDAccess(udAccessKey: udAccessKey, udAccessMode: accessMode, isRandomKey: true) } guard accessMode == .enabled else {