From 7596c100a38ec772f8ad5e1096f934ea8616ba20 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Fri, 18 Sep 2020 09:28:49 +1000 Subject: [PATCH] Fix display name bug --- Signal/src/Loki/View Controllers/GroupMembersVC.swift | 4 ++-- Signal/src/Loki/View Controllers/NewClosedGroupVC.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/src/Loki/View Controllers/GroupMembersVC.swift b/Signal/src/Loki/View Controllers/GroupMembersVC.swift index 4055555cd..9f0542c03 100644 --- a/Signal/src/Loki/View Controllers/GroupMembersVC.swift +++ b/Signal/src/Loki/View Controllers/GroupMembersVC.swift @@ -5,7 +5,7 @@ final class GroupMembersVC : BaseVC, UITableViewDataSource { private lazy var members: [String] = { func getDisplayName(for hexEncodedPublicKey: String) -> String { - return UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? "Unknown Contact" + return UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? hexEncodedPublicKey } return GroupUtilities.getClosedGroupMembers(thread).sorted { getDisplayName(for: $0) < getDisplayName(for: $1) } }() @@ -150,7 +150,7 @@ private extension GroupMembersVC { private func update() { profilePictureView.hexEncodedPublicKey = hexEncodedPublicKey profilePictureView.update() - displayNameLabel.text = UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? "Unknown Contact" + displayNameLabel.text = UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? hexEncodedPublicKey } } } diff --git a/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift b/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift index 20a2c0b63..302b9c37a 100644 --- a/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift +++ b/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift @@ -17,7 +17,7 @@ final class NewClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelegat } } func getDisplayName(for hexEncodedPublicKey: String) -> String { - return UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? "Unknown Contact" + return UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? hexEncodedPublicKey } let userPublicKey = getUserHexEncodedPublicKey() var userLinkedDevices: Set = [ userPublicKey ] @@ -338,7 +338,7 @@ private extension NewClosedGroupVC { private func update() { profilePictureView.hexEncodedPublicKey = hexEncodedPublicKey profilePictureView.update() - displayNameLabel.text = UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? "Unknown Contact" + displayNameLabel.text = UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? hexEncodedPublicKey let icon = hasTick ? #imageLiteral(resourceName: "CircleCheck") : #imageLiteral(resourceName: "Circle") tickImageView.image = icon.asTintedImage(color: Colors.text)! }