|
|
@ -1407,6 +1407,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
[self.primaryStorage setIDForMessageWithServerID:dataMessage.publicChatInfo.serverID to:incomingMessage.uniqueId in:transaction];
|
|
|
|
[self.primaryStorage setIDForMessageWithServerID:dataMessage.publicChatInfo.serverID to:incomingMessage.uniqueId in:transaction];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
|
NSString *url = [OWSLinkPreview previewURLForRawBodyText:incomingMessage.body];
|
|
|
|
NSString *url = [OWSLinkPreview previewURLForRawBodyText:incomingMessage.body];
|
|
|
|
if (url != nil) {
|
|
|
|
if (url != nil) {
|
|
|
|
[OWSLinkPreview tryToBuildPreviewInfoObjcWithPreviewUrl:url]
|
|
|
|
[OWSLinkPreview tryToBuildPreviewInfoObjcWithPreviewUrl:url]
|
|
|
@ -1418,6 +1419,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
return incomingMessage;
|
|
|
|
return incomingMessage;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1505,6 +1507,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
transaction:transaction];
|
|
|
|
transaction:transaction];
|
|
|
|
|
|
|
|
|
|
|
|
if (linkPreview != nil) {
|
|
|
|
if (linkPreview != nil) {
|
|
|
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
|
[OWSLinkPreview tryToBuildPreviewInfoObjcWithPreviewUrl:linkPreview.urlString]
|
|
|
|
[OWSLinkPreview tryToBuildPreviewInfoObjcWithPreviewUrl:linkPreview.urlString]
|
|
|
|
.thenOn(dispatch_get_main_queue(), ^(OWSLinkPreviewDraft *linkPreviewDraft) {
|
|
|
|
.thenOn(dispatch_get_main_queue(), ^(OWSLinkPreviewDraft *linkPreviewDraft) {
|
|
|
|
if (linkPreviewDraft.jpegImageData == nil) { return; }
|
|
|
|
if (linkPreviewDraft.jpegImageData == nil) { return; }
|
|
|
@ -1515,6 +1518,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
[incomingMessage saveWithTransaction:transaction];
|
|
|
|
[incomingMessage saveWithTransaction:transaction];
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
});
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
return incomingMessage;
|
|
|
|
return incomingMessage;
|
|
|
|