Skip to content

Commit 832cb97

Browse files
committed
add missing nullability macros
1 parent 9bdcbaa commit 832cb97

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

AxolotlKit/Classes/Prekeys/PreKeyBundle.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
//
2-
// AxolotlKeyFetch.h
3-
// AxolotlKit
4-
//
5-
// Created by Frederic Jacobs on 21/07/14.
6-
// Copyright (c) 2014 Frederic Jacobs. All rights reserved.
2+
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
73
//
84

95
#import <Foundation/Foundation.h>
106

7+
NS_ASSUME_NONNULL_BEGIN
8+
119
@interface PreKeyBundle : NSObject <NSSecureCoding>
1210

1311
@property (nonatomic, readonly) NSData *identityKey;
@@ -29,3 +27,5 @@
2927
identityKey:(NSData *)identityKey;
3028

3129
@end
30+
31+
NS_ASSUME_NONNULL_END

AxolotlKit/Classes/Prekeys/PreKeyBundle.m

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
//
2-
// AxolotlKeyFetch.m
3-
// AxolotlKit
4-
//
5-
// Created by Frederic Jacobs on 21/07/14.
6-
// Copyright (c) 2014 Frederic Jacobs. All rights reserved.
2+
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
73
//
84

95
#import "PreKeyBundle.h"
106

7+
NS_ASSUME_NONNULL_BEGIN
118

129
static NSString* const kCoderPKBIdentityKey = @"kCoderPKBIdentityKey";
1310
static NSString* const kCoderPKBregistrationId = @"kCoderPKBregistrationId";
@@ -62,7 +59,8 @@ - (nullable instancetype)initWithRegistrationId:(int)registrationId
6259
return self;
6360
}
6461

65-
- (id)initWithCoder:(NSCoder *)aDecoder{
62+
- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder
63+
{
6664
int registrationId = [aDecoder decodeIntForKey:kCoderPKBregistrationId];
6765
int deviceId = [aDecoder decodeIntForKey:kCoderPKBdeviceId];
6866
int preKeyId = [aDecoder decodeIntForKey:kCoderPKBpreKeyId];
@@ -103,3 +101,5 @@ +(BOOL)supportsSecureCoding{
103101
}
104102

105103
@end
104+
105+
NS_ASSUME_NONNULL_END
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
//
2-
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
2+
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
33
//
44

55
#import <Foundation/Foundation.h>
66

7+
NS_ASSUME_NONNULL_BEGIN
8+
79
@interface NSData (keyVersionByte)
810

911
- (instancetype)prependKeyType;
@@ -12,3 +14,5 @@
1214
- (nullable instancetype)removeKeyTypeAndReturnError:(NSError **)outError;
1315

1416
@end
17+
18+
NS_ASSUME_NONNULL_END

AxolotlKit/Classes/Utility/NSData+keyVersionByte.m

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
//
2-
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
2+
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
33
//
44

55
#import "NSData+keyVersionByte.h"
66
#import "AxolotlExceptions.h"
77
#import <SignalCoreKit/SCKExceptionWrapper.h>
88

9+
NS_ASSUME_NONNULL_BEGIN
10+
911
@implementation NSData (keyVersionByte)
1012

1113
const Byte DJB_TYPE = 0x05;
@@ -46,3 +48,5 @@ - (instancetype)throws_removeKeyType
4648
}
4749

4850
@end
51+
52+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)