From 3edf3ed19986e7dc5d96454cae71020548473754 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 19 Nov 2018 15:57:25 -0500
Subject: [PATCH] Don't use UD for "self" profile fetches.
---
SignalMessaging/profiles/ProfileFetcherJob.swift | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/SignalMessaging/profiles/ProfileFetcherJob.swift b/SignalMessaging/profiles/ProfileFetcherJob.swift
index 1261b3b0e..fae0485e5 100644
--- a/SignalMessaging/profiles/ProfileFetcherJob.swift
+++ b/SignalMessaging/profiles/ProfileFetcherJob.swift
@@ -62,6 +62,10 @@ public class ProfileFetcherJob: NSObject {
return SignalServiceRestClient()
}
+ private var tsAccountManager: TSAccountManager {
+ return SSKEnvironment.shared.tsAccountManager
+ }
+
// MARK: -
public func run(recipientIds: [String]) {
@@ -135,8 +139,13 @@ public class ProfileFetcherJob: NSObject {
Logger.error("getProfile: \(recipientId)")
- let udAccess = udManager.udAccess(forRecipientId: recipientId,
- requireSyncAccess: false)
+ // Don't use UD for "self" profile fetches.
+ var udAccess: OWSUDAccess?
+ if recipientId != tsAccountManager.localNumber() {
+ udAccess = udManager.udAccess(forRecipientId: recipientId,
+ requireSyncAccess: false)
+ }
+
return requestProfile(recipientId: recipientId,
udAccess: udAccess,
canFailoverUDAuth: true)