Clean up UI

pull/27/head
Niels Andriesse 6 years ago
parent 08812964f1
commit c040ea1e5e

@ -451,6 +451,7 @@ NS_ASSUME_NONNULL_BEGIN
return sectionIndex; return sectionIndex;
}; };
/** Loki: Original code
contents.sectionIndexTitlesForTableViewBlock = ^NSArray<NSString *> *_Nonnull contents.sectionIndexTitlesForTableViewBlock = ^NSArray<NSString *> *_Nonnull
{ {
typeof(self) strongSelf = weakSelf; typeof(self) strongSelf = weakSelf;
@ -460,6 +461,7 @@ NS_ASSUME_NONNULL_BEGIN
return strongSelf.collation.sectionTitles; return strongSelf.collation.sectionTitles;
}; };
*/
} }
self.tableViewController.contents = contents; self.tableViewController.contents = contents;

@ -40,9 +40,11 @@ static double const STALLED_PROGRESS = 0.9;
_socketStatusView.progress = 0.0f; _socketStatusView.progress = 0.0f;
_socketStatusView.progressTintColor = [UIColor ows_fadedBlueColor]; _socketStatusView.progressTintColor = [UIColor ows_fadedBlueColor];
/** Loki: Original code
if (![_socketStatusView superview]) { if (![_socketStatusView superview]) {
[self.navigationBar addSubview:_socketStatusView]; [self.navigationBar addSubview:_socketStatusView];
} }
*/
} }
- (void)dealloc - (void)dealloc

@ -36,7 +36,7 @@ public class CreatePreKeysOperation: OWSOperation {
self.primaryStorage.storeSignedPreKey(signedPreKeyRecord.id, signedPreKeyRecord: signedPreKeyRecord) self.primaryStorage.storeSignedPreKey(signedPreKeyRecord.id, signedPreKeyRecord: signedPreKeyRecord)
self.primaryStorage.setCurrentSignedPrekeyId(signedPreKeyRecord.id) self.primaryStorage.setCurrentSignedPrekeyId(signedPreKeyRecord.id)
Logger.debug("[CreatePreKeysOperation] done") Logger.debug("[Loki] Create pre keys operation done.")
self.reportSuccess() self.reportSuccess()
/* Loki: Original code /* Loki: Original code

@ -52,7 +52,7 @@ public class RefreshPreKeysOperation: OWSOperation {
TSPreKeyManager.clearPreKeyUpdateFailureCount() TSPreKeyManager.clearPreKeyUpdateFailureCount()
TSPreKeyManager.clearSignedPreKeyRecords() TSPreKeyManager.clearSignedPreKeyRecords()
Logger.debug("[PreKeyRefreshOperation] done") Logger.debug("[Loki] Pre key refresh operation done.")
self.reportSuccess() self.reportSuccess()
} }

@ -37,7 +37,7 @@ public class RotateSignedPreKeyOperation: OWSOperation {
TSPreKeyManager.clearPreKeyUpdateFailureCount() TSPreKeyManager.clearPreKeyUpdateFailureCount()
TSPreKeyManager.clearSignedPreKeyRecords() TSPreKeyManager.clearSignedPreKeyRecords()
Logger.debug("[RotateSignedKeyOperation] done") Logger.debug("[Loki] Rotate signed pre key operation done.")
self.reportSuccess() self.reportSuccess()
} }

@ -220,11 +220,11 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
[self decryptFriendRequestMessage:envelope [self decryptFriendRequestMessage:envelope
envelopeData:envelopeData envelopeData:envelopeData
successBlock:^(OWSMessageDecryptResult *result) { successBlock:^(OWSMessageDecryptResult *result) {
OWSLogDebug(@"decrypted friend request message."); OWSLogDebug(@"Decrypted friend request message.");
successBlock(result, transaction); successBlock(result, transaction);
} }
failureBlock:^(NSError * _Nullable error) { 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), envelopeAddress(envelope),
error); error);
failureBlock(); failureBlock();
@ -333,7 +333,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
NSData *encryptedData = envelope.content; NSData *encryptedData = envelope.content;
if (!encryptedData) { if (!encryptedData) {
OWSProdFail([OWSAnalyticsEvents messageManagerErrorMessageEnvelopeHasNoContent]); OWSProdFail([OWSAnalyticsEvents messageManagerErrorMessageEnvelopeHasNoContent]);
NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, @"Envelope has no content"); NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, @"Envelope has no content.");
return failureBlock(error); return failureBlock(error);
} }
@ -342,7 +342,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
NSData *_Nullable plaintextData = [[cipher decryptWithMessage:encryptedData] removePadding]; NSData *_Nullable plaintextData = [[cipher decryptWithMessage:encryptedData] removePadding];
if (!plaintextData) { 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); NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, errorString);
return failureBlock(error); return failureBlock(error);
} }

@ -423,12 +423,12 @@ NS_ASSUME_NONNULL_BEGIN
} }
OWSLogInfo(@"handling content: <Content: %@>", [self descriptionForContent:contentProto]); OWSLogInfo(@"handling content: <Content: %@>", [self descriptionForContent:contentProto]);
// Loki: Handle PreKeyBundle message // Loki: Handle pre key bundle message
if (contentProto.prekeyBundleMessage) { 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]; PreKeyBundle *_Nullable bundle = [contentProto.prekeyBundleMessage createPreKeyBundleWithTransaction:transaction];
if (!bundle) { 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]; [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 // Ref: SignalServiceKit/Loki/Docs/SessionReset.md
[self.primaryStorage archiveAllSessionsForContact:envelope.source protocolContext:transaction]; [self.primaryStorage archiveAllSessionsForContact:envelope.source protocolContext:transaction];

Loading…
Cancel
Save