Lint + tiny fixes

This commit is contained in:
Michelle Linington 2021-08-04 22:09:00 -07:00
parent e95b0a8dba
commit 9ef927fa62
6 changed files with 16 additions and 9 deletions

View File

@ -2,9 +2,9 @@
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
//
#import "OWSOutgoingSyncMessage.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
#import <SignalServiceKit/ProtoUtils.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>

View File

@ -2,8 +2,8 @@
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
//
#import "OWSDynamicOutgoingMessage.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN

View File

@ -93,7 +93,10 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope)
// SKDM's are not mutually exclusive with other content types
if (content.hasSenderKeyDistributionMessage) {
[message appendString:@" + SenderKeyDistributionMessage"];
if (message.length > 0) {
[message appendString:@" + "];
}
[message appendString:@"SenderKeyDistributionMessage"];
}
if (message.length > 0) {

View File

@ -2,8 +2,8 @@
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
//
#import "OWSOutgoingCallMessage.h"
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSOutgoingCallMessage.h>
#import <SignalServiceKit/ProtoUtils.h>
#import <SignalServiceKit/SignalRecipient.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>

View File

@ -2,9 +2,9 @@
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
//
#import "OWSOutgoingNullMessage.h"
#import <SignalCoreKit/Cryptography.h>
#import <SignalCoreKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSOutgoingNullMessage.h>
#import <SignalServiceKit/OWSVerificationStateSyncMessage.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <SignalServiceKit/TSContactThread.h>

View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2020 Open Whisper Systems. All rights reserved.
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
//
#import "OWSOutgoingResendResponse.h"
@ -43,7 +43,8 @@
address:address
transaction:transaction];
} else if (didPerformSessionReset) {
OWSLogInfo(@"Failed to find MSL record for resend request: %lli. Will reply with Null message", failedTimestamp);
OWSLogInfo(
@"Failed to find MSL record for resend request: %lli. Will reply with Null message", failedTimestamp);
} else {
OWSLogInfo(@"Failed to find MSL record for resend request: %lli. Declining to respond.", failedTimestamp);
return nil;
@ -97,7 +98,9 @@
}
}
- (void)updateWithSentRecipient:(SignalServiceAddress *)recipientAddress wasSentByUD:(BOOL)wasSentByUD transaction:(SDSAnyWriteTransaction *)transaction
- (void)updateWithSentRecipient:(SignalServiceAddress *)recipientAddress
wasSentByUD:(BOOL)wasSentByUD
transaction:(SDSAnyWriteTransaction *)transaction
{
[super updateWithSentRecipient:recipientAddress wasSentByUD:wasSentByUD transaction:transaction];
@ -135,7 +138,8 @@
- (void)resetSenderKeyDeliveryRecordIfNecessaryForThreadId:(NSString *)threadId
address:(SignalServiceAddress *)address
transaction:(SDSAnyWriteTransaction *)transaction {
transaction:(SDSAnyWriteTransaction *)transaction
{
OWSAssertDebug(threadId);
OWSAssertDebug(address);
OWSAssertDebug(transaction);