|
|
|
@ -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 {
|
|
|
|
|