diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index a06689d06..6ddac4f8a 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -451,6 +451,7 @@ NS_ASSUME_NONNULL_BEGIN return sectionIndex; }; + /** Loki: Original code contents.sectionIndexTitlesForTableViewBlock = ^NSArray *_Nonnull { typeof(self) strongSelf = weakSelf; @@ -460,6 +461,7 @@ NS_ASSUME_NONNULL_BEGIN return strongSelf.collation.sectionTitles; }; + */ } self.tableViewController.contents = contents; diff --git a/Signal/src/ViewControllers/SignalsNavigationController.m b/Signal/src/ViewControllers/SignalsNavigationController.m index 152bb2c83..095c1b757 100644 --- a/Signal/src/ViewControllers/SignalsNavigationController.m +++ b/Signal/src/ViewControllers/SignalsNavigationController.m @@ -40,9 +40,11 @@ static double const STALLED_PROGRESS = 0.9; _socketStatusView.progress = 0.0f; _socketStatusView.progressTintColor = [UIColor ows_fadedBlueColor]; + /** Loki: Original code if (![_socketStatusView superview]) { [self.navigationBar addSubview:_socketStatusView]; } + */ } - (void)dealloc diff --git a/SignalServiceKit/src/Account/CreatePreKeysOperation.swift b/SignalServiceKit/src/Account/CreatePreKeysOperation.swift index 149ea3916..91aceac70 100644 --- a/SignalServiceKit/src/Account/CreatePreKeysOperation.swift +++ b/SignalServiceKit/src/Account/CreatePreKeysOperation.swift @@ -36,7 +36,7 @@ public class CreatePreKeysOperation: OWSOperation { self.primaryStorage.storeSignedPreKey(signedPreKeyRecord.id, signedPreKeyRecord: signedPreKeyRecord) self.primaryStorage.setCurrentSignedPrekeyId(signedPreKeyRecord.id) - Logger.debug("[CreatePreKeysOperation] done") + Logger.debug("[Loki] Create pre keys operation done.") self.reportSuccess() /* Loki: Original code diff --git a/SignalServiceKit/src/Account/PreKeyRefreshOperation.swift b/SignalServiceKit/src/Account/PreKeyRefreshOperation.swift index dc97becc4..9ef53c46d 100644 --- a/SignalServiceKit/src/Account/PreKeyRefreshOperation.swift +++ b/SignalServiceKit/src/Account/PreKeyRefreshOperation.swift @@ -52,7 +52,7 @@ public class RefreshPreKeysOperation: OWSOperation { TSPreKeyManager.clearPreKeyUpdateFailureCount() TSPreKeyManager.clearSignedPreKeyRecords() - Logger.debug("[PreKeyRefreshOperation] done") + Logger.debug("[Loki] Pre key refresh operation done.") self.reportSuccess() } diff --git a/SignalServiceKit/src/Account/RotateSignedKeyOperation.swift b/SignalServiceKit/src/Account/RotateSignedKeyOperation.swift index 4e973dcc4..b2722dedd 100644 --- a/SignalServiceKit/src/Account/RotateSignedKeyOperation.swift +++ b/SignalServiceKit/src/Account/RotateSignedKeyOperation.swift @@ -37,7 +37,7 @@ public class RotateSignedPreKeyOperation: OWSOperation { TSPreKeyManager.clearPreKeyUpdateFailureCount() TSPreKeyManager.clearSignedPreKeyRecords() - Logger.debug("[RotateSignedKeyOperation] done") + Logger.debug("[Loki] Rotate signed pre key operation done.") self.reportSuccess() } diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m index 82f0ea0c2..977978978 100644 --- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m +++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m @@ -220,11 +220,11 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes [self decryptFriendRequestMessage:envelope envelopeData:envelopeData successBlock:^(OWSMessageDecryptResult *result) { - OWSLogDebug(@"decrypted friend request message."); + OWSLogDebug(@"Decrypted friend request message."); successBlock(result, transaction); } failureBlock:^(NSError * _Nullable error) { - OWSLogError(@"decrypting friend request message from address: %@ failed with error: %@", + OWSLogError(@"Decrypting friend request message from address: %@ failed with error: %@.", envelopeAddress(envelope), error); failureBlock(); @@ -333,7 +333,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes NSData *encryptedData = envelope.content; if (!encryptedData) { OWSProdFail([OWSAnalyticsEvents messageManagerErrorMessageEnvelopeHasNoContent]); - NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, @"Envelope has no content"); + NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, @"Envelope has no content."); return failureBlock(error); } @@ -342,7 +342,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes NSData *_Nullable plaintextData = [[cipher decryptWithMessage:encryptedData] removePadding]; if (!plaintextData) { - NSString *errorString = [NSString stringWithFormat:@"Failed to decrypt friend request message for %@", recipientId]; + NSString *errorString = [NSString stringWithFormat:@"Failed to decrypt friend request message for: %@.", recipientId]; NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, errorString); return failureBlock(error); } diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index d18f97431..1cdf677c4 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -423,12 +423,12 @@ NS_ASSUME_NONNULL_BEGIN } OWSLogInfo(@"handling content: ", [self descriptionForContent:contentProto]); - // Loki: Handle PreKeyBundle message + // Loki: Handle pre key bundle message if (contentProto.prekeyBundleMessage) { - OWSLogInfo(@"Received a prekey bundle message from: %@", envelope.source); + OWSLogInfo(@"Received a pre key bundle message from: %@.", envelope.source); PreKeyBundle *_Nullable bundle = [contentProto.prekeyBundleMessage createPreKeyBundleWithTransaction:transaction]; if (!bundle) { - OWSFailDebug(@"Failed to create PreKeyBundle from message"); + OWSFailDebug(@"Failed to create PreKeyBundle from message."); } [self.primaryStorage setPreKeyBundle:bundle forContact:envelope.source transaction:transaction]; } @@ -1020,7 +1020,7 @@ NS_ASSUME_NONNULL_BEGIN * ================ */ - // Loki: Archive all our session + // Loki: Archive all our sessions // Ref: SignalServiceKit/Loki/Docs/SessionReset.md [self.primaryStorage archiveAllSessionsForContact:envelope.source protocolContext:transaction];