From bc830c19da8dd573158f1759ad009cc90156eb1d Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Sun, 2 Feb 2020 19:08:46 +1100 Subject: [PATCH] Fix member count bug --- Signal/src/Loki/Components/ConversationCell.swift | 2 +- SignalServiceKit/src/Loki/Utilities/GroupUtilities.swift | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Signal/src/Loki/Components/ConversationCell.swift b/Signal/src/Loki/Components/ConversationCell.swift index e4f49b1f9..ddca5ca01 100644 --- a/Signal/src/Loki/Components/ConversationCell.swift +++ b/Signal/src/Loki/Components/ConversationCell.swift @@ -170,7 +170,7 @@ final class ConversationCell : UITableViewCell { case .calculatingPoW, .uploading, .sending: image = #imageLiteral(resourceName: "CircleDotDotDot") case .sent, .skipped, .delivered: image = #imageLiteral(resourceName: "CircleCheck") case .read: image = #imageLiteral(resourceName: "FilledCircleCheck") - case .failed: image = #imageLiteral(resourceName: "message_status_failed") + case .failed: image = #imageLiteral(resourceName: "message_status_failed").asTintedImage(color: Colors.text)! } statusIndicatorView.image = image statusIndicatorView.isHidden = false diff --git a/SignalServiceKit/src/Loki/Utilities/GroupUtilities.swift b/SignalServiceKit/src/Loki/Utilities/GroupUtilities.swift index b0a72d2c7..5486fef8e 100644 --- a/SignalServiceKit/src/Loki/Utilities/GroupUtilities.swift +++ b/SignalServiceKit/src/Loki/Utilities/GroupUtilities.swift @@ -11,7 +11,8 @@ public enum GroupUtilities { public static func getClosedGroupMembers(_ closedGroup: TSGroupThread, with transaction: YapDatabaseReadTransaction) -> [String] { let userHexEncodedPublicKey = getUserHexEncodedPublicKey() - let linkedDeviceHexEncodedPublicKeys = LokiDatabaseUtilities.getLinkedDeviceHexEncodedPublicKeys(for: userHexEncodedPublicKey, in: transaction) + var linkedDeviceHexEncodedPublicKeys = LokiDatabaseUtilities.getLinkedDeviceHexEncodedPublicKeys(for: userHexEncodedPublicKey, in: transaction) + linkedDeviceHexEncodedPublicKeys.remove(userHexEncodedPublicKey) // Show the user as a member return closedGroup.groupModel.groupMemberIds.filter { !linkedDeviceHexEncodedPublicKeys.contains($0) } }