keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #114 from loki-project/performance

Browse Source 
Fix Freeze on Joining an Open Group
pull/115/head
gmbnt 5 years ago committed by GitHub
parent 1b7ee85645 d7256ed0b3
commit fd4b3b7d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

16
SignalServiceKit/src/Messages/Interactions/TSMessage.m
Unescape Escape View File

@ -350,21 +350,21 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
if (attachmentDescription.length > 0 && bodyDescription.length > 0) { if (attachmentDescription.length > 0 && bodyDescription.length > 0) {
// Attachment with caption. // Attachment with caption.
if ([CurrentAppContext() isRTL]) { // if ([CurrentAppContext() isRTL]) {
return [[bodyDescription stringByAppendingString:@": "] stringByAppendingString:attachmentDescription]; // return [[bodyDescription stringByAppendingString:@": "] stringByAppendingString:attachmentDescription];
} else { // } else {
return [[attachmentDescription stringByAppendingString:@": "] stringByAppendingString:bodyDescription]; return [[attachmentDescription stringByAppendingString:@": "] stringByAppendingString:bodyDescription];
} // }
} else if (bodyDescription.length > 0) { } else if (bodyDescription.length > 0) {
return bodyDescription; return bodyDescription;
} else if (attachmentDescription.length > 0) { } else if (attachmentDescription.length > 0) {
return attachmentDescription; return attachmentDescription;
} else if (self.contactShare) { } else if (self.contactShare) {
if (CurrentAppContext().isRTL) { // if (CurrentAppContext().isRTL) {
return [self.contactShare.name.displayName stringByAppendingString:@" 👤"]; // return [self.contactShare.name.displayName stringByAppendingString:@" 👤"];
} else { // } else {
return [@"👤 " stringByAppendingString:self.contactShare.name.displayName]; return [@"👤 " stringByAppendingString:self.contactShare.name.displayName];
} // }
} else { } else {
// OWSFailDebug(@"message has neither body nor attachment."); // OWSFailDebug(@"message has neither body nor attachment.");
// TODO: We should do better here. // TODO: We should do better here.

4
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -1399,14 +1399,14 @@ NS_ASSUME_NONNULL_BEGIN
// The envelope source is set during UD decryption. // The envelope source is set during UD decryption.
if ([ECKeyPair isValidHexEncodedPublicKeyWithCandidate:envelope.source]) { if ([ECKeyPair isValidHexEncodedPublicKeyWithCandidate:envelope.source] && dataMessage.publicChatInfo == nil) { // Handled in LokiPublicChatPoller for open group messages
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0); dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
[[LKAPI getDestinationsFor:envelope.source inTransaction:transaction].ensureOn(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^() { [[LKAPI getDestinationsFor:envelope.source inTransaction:transaction].ensureOn(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^() {
dispatch_semaphore_signal(semaphore); dispatch_semaphore_signal(semaphore);
}).catchOn(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(NSError *error) { }).catchOn(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(NSError *error) {
dispatch_semaphore_signal(semaphore); dispatch_semaphore_signal(semaphore);
}) retainUntilComplete]; }) retainUntilComplete];
dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC)); dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 4 * NSEC_PER_SEC));
} }
if (groupId.length > 0) { if (groupId.length > 0) {

Write Preview
Loading…
Cancel
Save