Merge branch 'nt/sticker-receive-fix' into release/2.41.0

This commit is contained in:
Michael Kirk 2019-07-22 14:09:23 -06:00
commit 8a2804cc95

View File

@ -606,7 +606,8 @@ perMessageExpirationDurationSeconds:(unsigned int)perMessageExpirationDurationSe
- (BOOL)hasRenderableContent
{
return (self.body.length > 0 || self.attachmentIds.count > 0 || self.contactShare != nil);
return (
self.body.length > 0 || self.attachmentIds.count > 0 || self.contactShare != nil || self.messageSticker != nil);
}
#pragma mark - Per-message expiration