oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/typingIndicatorFixes'

Browse source
This commit is contained in:
Matthew Chen 2018-11-07 08:51:50 -05:00
parent 3f135e9f73 cdfd2779a3
commit ada4bf5956
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Signal/src/ViewControllers/ConversationView/Cells/TypingIndicatorCell.swift
View file

@ -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)))
}
}

4
SignalServiceKit/src/Messages/OWSMessageManager.m
View file

@ -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) {