pull/213/head
nielsandriesse 5 years ago
parent 5e40221936
commit b87ab79c5b

@ -134,17 +134,18 @@ final class ConversationCell : UITableViewCell {
// MARK: Updating // MARK: Updating
private func update() { private func update() {
AssertIsOnMainThread()
MentionsManager.populateUserPublicKeyCacheIfNeeded(for: threadViewModel.threadRecord.uniqueId!) // FIXME: This is a terrible place to do this MentionsManager.populateUserPublicKeyCacheIfNeeded(for: threadViewModel.threadRecord.uniqueId!) // FIXME: This is a terrible place to do this
unreadMessagesIndicatorView.alpha = threadViewModel.hasUnreadMessages ? 1 : 0.0001 // Setting the alpha to exactly 0 causes an issue on iOS 12 unreadMessagesIndicatorView.alpha = threadViewModel.hasUnreadMessages ? 1 : 0.0001 // Setting the alpha to exactly 0 causes an issue on iOS 12
profilePictureView.openGroupProfilePicture = nil
if threadViewModel.isGroupThread { if threadViewModel.isGroupThread {
if threadViewModel.name == "Session Public Chat" { if threadViewModel.name == "Loki Public Chat" {
profilePictureView.hexEncodedPublicKey = "" profilePictureView.hexEncodedPublicKey = ""
profilePictureView.isRSSFeed = true profilePictureView.isRSSFeed = true
} else { } else {
if let openGroupProfilePicture = (threadViewModel.threadRecord as! TSGroupThread).groupModel.groupImage { if let openGroupProfilePicture = (threadViewModel.threadRecord as! TSGroupThread).groupModel.groupImage {
profilePictureView.openGroupProfilePicture = openGroupProfilePicture profilePictureView.openGroupProfilePicture = openGroupProfilePicture
} else { } else {
profilePictureView.openGroupProfilePicture = nil
var users = MentionsManager.userPublicKeyCache[threadViewModel.threadRecord.uniqueId!] ?? [] var users = MentionsManager.userPublicKeyCache[threadViewModel.threadRecord.uniqueId!] ?? []
users.remove(getUserHexEncodedPublicKey()) users.remove(getUserHexEncodedPublicKey())
let randomUsers = users.sorted().prefix(2) // Sort to provide a level of stability let randomUsers = users.sorted().prefix(2) // Sort to provide a level of stability

@ -115,7 +115,7 @@ class ConversationViewItemActions: NSObject {
actions.append(deleteAction) actions.append(deleteAction)
} }
if isGroup && conversationViewItem.interaction.thread.name() == "Session Public Chat" { if isGroup && conversationViewItem.interaction.thread.name() == "Loki Public Chat" {
let reportAction = MessageActionBuilder.report(conversationViewItem, delegate: delegate) let reportAction = MessageActionBuilder.report(conversationViewItem, delegate: delegate)
actions.append(reportAction) actions.append(reportAction)
} }
@ -159,7 +159,7 @@ class ConversationViewItemActions: NSObject {
actions.append(deleteAction) actions.append(deleteAction)
} }
if isGroup && conversationViewItem.interaction.thread.name() == "Session Public Chat" { if isGroup && conversationViewItem.interaction.thread.name() == "Loki Public Chat" {
let reportAction = MessageActionBuilder.report(conversationViewItem, delegate: delegate) let reportAction = MessageActionBuilder.report(conversationViewItem, delegate: delegate)
actions.append(reportAction) actions.append(reportAction)
} }
@ -192,7 +192,7 @@ class ConversationViewItemActions: NSObject {
actions.append(deleteAction) actions.append(deleteAction)
} }
if isGroup && conversationViewItem.interaction.thread.name() == "Session Public Chat" { if isGroup && conversationViewItem.interaction.thread.name() == "Loki Public Chat" {
let reportAction = MessageActionBuilder.report(conversationViewItem, delegate: delegate) let reportAction = MessageActionBuilder.report(conversationViewItem, delegate: delegate)
actions.append(reportAction) actions.append(reportAction)
} }

@ -958,7 +958,7 @@ const CGFloat kIconViewLength = 24;
if (self.isGroupThread) { if (self.isGroupThread) {
TSGroupThread* groupThread = (TSGroupThread *)self.thread; TSGroupThread* groupThread = (TSGroupThread *)self.thread;
if (groupThread.isPublicChat && groupThread.groupModel.groupImage != nil && ![groupThread.groupModel.groupName isEqual:@"Session Public Chat"]) { if (groupThread.isPublicChat && groupThread.groupModel.groupImage != nil && ![groupThread.groupModel.groupName isEqual:@"Loki Public Chat"]) {
profilePictureView.openGroupProfilePicture = groupThread.groupModel.groupImage; profilePictureView.openGroupProfilePicture = groupThread.groupModel.groupImage;
profilePictureView.isRSSFeed = false; profilePictureView.isRSSFeed = false;
} else { } else {

@ -44,6 +44,7 @@ public final class ProfilePictureView : UIView {
// MARK: Updating // MARK: Updating
@objc public func update() { @objc public func update() {
AssertIsOnMainThread()
func getProfilePicture(of size: CGFloat, for hexEncodedPublicKey: String) -> UIImage? { func getProfilePicture(of size: CGFloat, for hexEncodedPublicKey: String) -> UIImage? {
guard !hexEncodedPublicKey.isEmpty else { return nil } guard !hexEncodedPublicKey.isEmpty else { return nil }
return OWSProfileManager.shared().profileAvatar(forRecipientId: hexEncodedPublicKey) ?? Identicon.generateIcon(string: hexEncodedPublicKey, size: size) return OWSProfileManager.shared().profileAvatar(forRecipientId: hexEncodedPublicKey) ?? Identicon.generateIcon(string: hexEncodedPublicKey, size: size)

Loading…
Cancel
Save