From b87ab79c5b2d209e20f2265b9d9cc9de059dbc6d Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 15 Jun 2020 13:50:56 +1000
Subject: [PATCH] Debug

---
 Signal/src/Loki/Components/ConversationCell.swift           | 5 +++--
 Signal/src/Models/MessageActions.swift                      | 6 +++---
 .../ThreadSettings/OWSConversationSettingsViewController.m  | 2 +-
 .../Loki/Redesign/Components/ProfilePictureView.swift       | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Signal/src/Loki/Components/ConversationCell.swift b/Signal/src/Loki/Components/ConversationCell.swift
index 43f4f1246..f31c8ba2f 100644
--- a/Signal/src/Loki/Components/ConversationCell.swift
+++ b/Signal/src/Loki/Components/ConversationCell.swift
@@ -134,17 +134,18 @@ final class ConversationCell : UITableViewCell {
     
     // MARK: Updating
     private func update() {
+        AssertIsOnMainThread()
         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
+        profilePictureView.openGroupProfilePicture = nil
         if threadViewModel.isGroupThread {
-            if threadViewModel.name == "Session Public Chat" {
+            if threadViewModel.name == "Loki Public Chat" {
                 profilePictureView.hexEncodedPublicKey = ""
                 profilePictureView.isRSSFeed = true
             } else {
                 if let openGroupProfilePicture = (threadViewModel.threadRecord as! TSGroupThread).groupModel.groupImage {
                     profilePictureView.openGroupProfilePicture = openGroupProfilePicture
                 } else {
-                    profilePictureView.openGroupProfilePicture = nil
                     var users = MentionsManager.userPublicKeyCache[threadViewModel.threadRecord.uniqueId!] ?? []
                     users.remove(getUserHexEncodedPublicKey())
                     let randomUsers = users.sorted().prefix(2) // Sort to provide a level of stability
diff --git a/Signal/src/Models/MessageActions.swift b/Signal/src/Models/MessageActions.swift
index 5d99a6c91..70883b76e 100644
--- a/Signal/src/Models/MessageActions.swift
+++ b/Signal/src/Models/MessageActions.swift
@@ -115,7 +115,7 @@ class ConversationViewItemActions: NSObject {
             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)
             actions.append(reportAction)
         }
@@ -159,7 +159,7 @@ class ConversationViewItemActions: NSObject {
             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)
             actions.append(reportAction)
         }
@@ -192,7 +192,7 @@ class ConversationViewItemActions: NSObject {
             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)
             actions.append(reportAction)
         }
diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
index b9269b9c7..bc3ffd057 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@@ -958,7 +958,7 @@ const CGFloat kIconViewLength = 24;
     
     if (self.isGroupThread) {
         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.isRSSFeed = false;
         } else {
diff --git a/SignalMessaging/Loki/Redesign/Components/ProfilePictureView.swift b/SignalMessaging/Loki/Redesign/Components/ProfilePictureView.swift
index 056db58aa..3f5e90bd9 100644
--- a/SignalMessaging/Loki/Redesign/Components/ProfilePictureView.swift
+++ b/SignalMessaging/Loki/Redesign/Components/ProfilePictureView.swift
@@ -44,6 +44,7 @@ public final class ProfilePictureView : UIView {
     
     // MARK: Updating
     @objc public func update() {
+        AssertIsOnMainThread()
         func getProfilePicture(of size: CGFloat, for hexEncodedPublicKey: String) -> UIImage? {
             guard !hexEncodedPublicKey.isEmpty else { return nil }
             return OWSProfileManager.shared().profileAvatar(forRecipientId: hexEncodedPublicKey) ?? Identicon.generateIcon(string: hexEncodedPublicKey, size: size)