Merge pull request #411 from RyanRory/expiration-timer-fix
Fix Expiration Timer Issues
This commit is contained in:
commit
74ba177250
|
@ -354,6 +354,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
|
||||||
// the previous value when the keyboard is shown.
|
// the previous value when the keyboard is shown.
|
||||||
self.messagesTableView.reloadData()
|
self.messagesTableView.reloadData()
|
||||||
}
|
}
|
||||||
|
self.markAllAsRead()
|
||||||
}
|
}
|
||||||
if shouldAnimate {
|
if shouldAnimate {
|
||||||
messagesTableView.performBatchUpdates(batchUpdates, completion: batchUpdatesCompletion)
|
messagesTableView.performBatchUpdates(batchUpdates, completion: batchUpdatesCompletion)
|
||||||
|
|
|
@ -144,6 +144,17 @@ NS_ASSUME_NONNULL_BEGIN
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOL isAllAttachmentDownloaded = YES;
|
||||||
|
for (NSString *attachmentId in self.attachmentIds) {
|
||||||
|
TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:attachmentId transaction:transaction];
|
||||||
|
isAllAttachmentDownloaded = isAllAttachmentDownloaded && attachment.isDownloaded;
|
||||||
|
if (!isAllAttachmentDownloaded) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isAllAttachmentDownloaded) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
_read = YES;
|
_read = YES;
|
||||||
[self saveWithTransaction:transaction];
|
[self saveWithTransaction:transaction];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue