From cdfd2779a358bdad7594caa00deb1dae37d1947e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 6 Nov 2018 17:21:24 -0500 Subject: [PATCH] Fix a couple small bugs in the typing indicators. --- .../ConversationView/Cells/TypingIndicatorCell.swift | 8 ++++---- SignalServiceKit/src/Messages/OWSMessageManager.m | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/TypingIndicatorCell.swift b/Signal/src/ViewControllers/ConversationView/Cells/TypingIndicatorCell.swift index 0713cdcea..1de1235c6 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/TypingIndicatorCell.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/TypingIndicatorCell.swift @@ -125,11 +125,11 @@ public class TypingIndicatorCell: ConversationViewCell { let bubbleSize = CGSizeAdd(insetsSize, typingIndicatorSize) if shouldShowAvatar() { - let avatarSize = CGSize(width: kAvatarSize, height: kAvatarSize) - return CGSizeCeil(CGSize(width: avatarSize.width + kAvatarHSpacing + bubbleSize.width, - height: max(avatarSize.height, bubbleSize.height))) + return CGSizeCeil(CGSize(width: kAvatarSize + kAvatarHSpacing + bubbleSize.width, + height: max(kAvatarSize, bubbleSize.height))) } else { - return bubbleSize + return CGSizeCeil(CGSize(width: bubbleSize.width, + height: max(kAvatarSize, bubbleSize.height))) } } diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index e25af91e6..7880584f4 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -663,6 +663,10 @@ NS_ASSUME_NONNULL_BEGIN OWSFailDebug(@"Missing typingMessage."); return; } + if (typingMessage.timestamp != envelope.timestamp) { + OWSFailDebug(@"typingMessage has invalid timestamp."); + return; + } TSThread *_Nullable thread; if (typingMessage.hasGroupID) {