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

Respond to CR.

Browse source
This commit is contained in:
Matthew Chen 2018-07-11 11:23:31 -04:00
parent e01579ed44
commit 6d45d533ef
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
View file

@ -195,7 +195,7 @@ NS_ASSUME_NONNULL_BEGIN
}
TSMessage *message = (TSMessage *)viewItem.interaction;
return message.shouldStartExpireTimer;
return message.isExpiringMessage;
}
- (void)configureLabelsWithConversationViewItem:(ConversationViewItem *)viewItem

4
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View file

@ -4807,7 +4807,7 @@ typedef enum : NSUInteger {
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)viewItem.interaction;
MessageReceiptStatus receiptStatus =
[MessageRecipientStatusUtils recipientStatusWithOutgoingMessage:outgoingMessage];
BOOL isDisappearingMessage = outgoingMessage.shouldStartExpireTimer;
BOOL isDisappearingMessage = outgoingMessage.isExpiringMessage;
if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {
TSOutgoingMessage *nextOutgoingMessage = (TSOutgoingMessage *)nextViewItem.interaction;
@ -4846,7 +4846,7 @@ typedef enum : NSUInteger {
TSIncomingMessage *incomingMessage = (TSIncomingMessage *)viewItem.interaction;
NSString *incomingSenderId = incomingMessage.authorId;
OWSAssert(incomingSenderId.length > 0);
BOOL isDisappearingMessage = incomingMessage.shouldStartExpireTimer;
BOOL isDisappearingMessage = incomingMessage.isExpiringMessage;
NSString *_Nullable nextIncomingSenderId = nil;
if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {