keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix display name bug

Browse Source
pull/275/head
nielsandriesse 5 years ago
parent f86ad16767
commit 7596c100a3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/Loki/View Controllers/GroupMembersVC.swift
Unescape Escape View File

@ -5,7 +5,7 @@ final class GroupMembersVC : BaseVC, UITableViewDataSource {
private lazy var members: [String] = { private lazy var members: [String] = {
func getDisplayName(for hexEncodedPublicKey: String) -> 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) } return GroupUtilities.getClosedGroupMembers(thread).sorted { getDisplayName(for: $0) < getDisplayName(for: $1) }
}() }()
@ -150,7 +150,7 @@ private extension GroupMembersVC {
private func update() { private func update() {
profilePictureView.hexEncodedPublicKey = hexEncodedPublicKey profilePictureView.hexEncodedPublicKey = hexEncodedPublicKey
profilePictureView.update() profilePictureView.update()
displayNameLabel.text = UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? "Unknown Contact" displayNameLabel.text = UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? hexEncodedPublicKey
} }
} }
} }

4
Signal/src/Loki/View Controllers/NewClosedGroupVC.swift
Unescape Escape View File

@ -17,7 +17,7 @@ final class NewClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelegat
} }
} }
func getDisplayName(for hexEncodedPublicKey: String) -> String { func getDisplayName(for hexEncodedPublicKey: String) -> String {
return UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? "Unknown Contact" return UserDisplayNameUtilities.getPrivateChatDisplayName(for: hexEncodedPublicKey) ?? hexEncodedPublicKey
} }
let userPublicKey = getUserHexEncodedPublicKey() let userPublicKey = getUserHexEncodedPublicKey()
var userLinkedDevices: Set<String> = [ userPublicKey ] var userLinkedDevices: Set<String> = [ userPublicKey ]
@ -338,7 +338,7 @@ private extension NewClosedGroupVC {
private func update() { private func update() {
profilePictureView.hexEncodedPublicKey = hexEncodedPublicKey profilePictureView.hexEncodedPublicKey = hexEncodedPublicKey
profilePictureView.update() 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") let icon = hasTick ? #imageLiteral(resourceName: "CircleCheck") : #imageLiteral(resourceName: "Circle")
tickImageView.image = icon.asTintedImage(color: Colors.text)! tickImageView.image = icon.asTintedImage(color: Colors.text)!
} }

Write Preview
Loading…
Cancel
Save