From 74854dd78816afa84e3ad639eff05b93d1fb5c80 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 3 Nov 2017 13:48:38 -0400 Subject: [PATCH] Tweak biases of the message status logic. // FREEBIE --- .../Utils/MessageRecipientStatusUtils.swift | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift index 50a753e4a..0b56c6234 100644 --- a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift +++ b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift @@ -124,27 +124,23 @@ class MessageRecipientStatusUtils: NSObject { return NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages") } else if outgoingMessage.messageState == .attemptingOut { if outgoingMessage.hasAttachments() { - assert(outgoingMessage.messageState == .attemptingOut) - return NSLocalizedString("MESSAGE_STATUS_UPLOADING", comment:"message footer while attachment is uploading") } else { - assert(outgoingMessage.messageState == .attemptingOut) - return NSLocalizedString("MESSAGE_STATUS_SENDING", comment:"message status while message is sending.") } } + assert(outgoingMessage.messageState == .sentToService) + let recipientReadMap = outgoingMessage.recipientReadMap if recipientReadMap.count > 0 { - assert(outgoingMessage.messageState == .sentToService) return NSLocalizedString("MESSAGE_STATUS_READ", comment:"message footer for read messages") } let recipientDeliveryMap = outgoingMessage.recipientDeliveryMap if recipientDeliveryMap.count > 0 { - assert(outgoingMessage.messageState == .sentToService) return NSLocalizedString("MESSAGE_STATUS_DELIVERED", comment:"message status for message delivered to their recipient.") } @@ -165,10 +161,8 @@ class MessageRecipientStatusUtils: NSObject { return .failed } else if outgoingMessage.messageState == .attemptingOut { if outgoingMessage.hasAttachments() { - assert(outgoingMessage.messageState == .attemptingOut) return .uploading } else { - assert(outgoingMessage.messageState == .attemptingOut) return .sending } }