Merge branch 'mkirk/compiler-warnings'

Author: michaelkirk-signal

AxolotlKit/Classes/Prekeys/PreKeyRecord.h

@@ -5,6 +5,7 @@
 #import <Curve25519Kit/Curve25519.h>
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
 
 @interface PreKeyRecord : NSObject <NSSecureCoding>
 
@@ -13,9 +14,11 @@
 @property (nonatomic, readonly, nullable) NSDate *createdAt;
 
 - (instancetype)initWithId:(int)identifier
-                   keyPair:(ECKeyPair*)keyPair
+                   keyPair:(ECKeyPair *)keyPair
                  createdAt:(NSDate *)createdAt;
 
 - (void)setCreatedAtToNow;
 
 @end
+
+NS_ASSUME_NONNULL_END

AxolotlKit/Classes/Prekeys/PreKeyRecord.m

@@ -8,6 +8,8 @@
 
 #import "PreKeyRecord.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 static NSString* const kCoderPreKeyId        = @"kCoderPreKeyId";
 static NSString* const kCoderPreKeyPair      = @"kCoderPreKeyPair";
 static NSString* const kCoderCreatedAt       = @"kCoderCreatedAt";
@@ -35,7 +37,7 @@ - (instancetype)initWithId:(int)identifier
     return self;
 }
 
-- (id)initWithCoder:(NSCoder *)aDecoder {
+- (nullable id)initWithCoder:(NSCoder *)aDecoder {
     return [self initWithId:[aDecoder decodeIntForKey:kCoderPreKeyId]
                     keyPair:[aDecoder decodeObjectOfClass:[ECKeyPair class] forKey:kCoderPreKeyPair]
                   createdAt:[aDecoder decodeObjectOfClass:[NSDate class] forKey:kCoderCreatedAt]];
@@ -54,3 +56,5 @@ - (void)setCreatedAtToNow {
 }
 
 @end
+
+NS_ASSUME_NONNULL_END

AxolotlKit/Classes/Prekeys/SignedPrekeyRecord.h

@@ -6,6 +6,8 @@
 #import "PreKeyRecord.h"
 #import <Curve25519Kit/Curve25519.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SignedPreKeyRecord : PreKeyRecord <NSSecureCoding>
 
 @property (nonatomic, readonly) NSData *signature;
@@ -19,3 +21,5 @@
 - (void)markAsAcceptedByService;
 
 @end
+
+NS_ASSUME_NONNULL_END

AxolotlKit/Classes/Prekeys/SignedPrekeyRecord.m

@@ -4,6 +4,8 @@
 
 #import "SignedPrekeyRecord.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 static NSString* const kCoderPreKeyId        = @"kCoderPreKeyId";
 static NSString* const kCoderPreKeyPair      = @"kCoderPreKeyPair";
 static NSString* const kCoderPreKeyDate      = @"kCoderPreKeyDate";
@@ -52,7 +54,7 @@ - (instancetype)initWithId:(int)identifier keyPair:(ECKeyPair *)keyPair signatur
     return self;
 }
 
-- (id)initWithCoder:(NSCoder *)aDecoder{
+- (nullable id)initWithCoder:(NSCoder *)aDecoder{
     return [self initWithId:[aDecoder decodeIntForKey:kCoderPreKeyId]
                      keyPair:[aDecoder decodeObjectOfClass:[ECKeyPair class] forKey:kCoderPreKeyPair]
                    signature:[aDecoder decodeObjectOfClass:[NSData class] forKey:kCoderPreKeySignature]
@@ -79,3 +81,5 @@ - (void)markAsAcceptedByService
 }
 
 @end
+
+NS_ASSUME_NONNULL_END