Clean up nullability annotations and ensure full NS_ASSUME_NONNULL coverage

Source/ARTChannels.m

@@ -6,13 +6,17 @@
 #import "ARTRestChannel.h"
 #import "ARTGCD.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTChannels() {
     __weak id<ARTChannelsDelegate> _delegate; // weak because delegates outlive their counterpart
     dispatch_queue_t _queue;
 }
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTChannels
 
 - (instancetype)initWithDelegate:(id)delegate dispatchQueue:(dispatch_queue_t)queue prefix:(NSString *)prefix {

Source/ARTClientOptions.m

@@ -18,6 +18,8 @@
 
 NSString *ARTDefaultEnvironment = nil;
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTClientOptions ()
 
 @property (nonatomic) NSMutableDictionary<NSString *, id> *pluginData;
@@ -26,6 +28,8 @@ - (instancetype)initDefaults;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTClientOptions
 
 - (instancetype)initDefaults {

Source/ARTContinuousClock.m

@@ -1,5 +1,7 @@
 #import "ARTContinuousClock.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTContinuousClockInstant ()
 
 - (instancetype)initWithTime:(uint64_t)time NS_DESIGNATED_INITIALIZER;
@@ -13,6 +15,8 @@ - (instancetype)initWithTime:(uint64_t)time NS_DESIGNATED_INITIALIZER;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTContinuousClock
 
 - (ARTContinuousClockInstant *)now {

Source/ARTCrypto.m

@@ -5,6 +5,8 @@
 
 #define ART_CBC_BLOCK_LENGTH (16)
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTCipherParams ()
 
 - (BOOL)ccAlgorithm:(CCAlgorithm *)algorithm error:(NSError **)error;
@@ -17,6 +19,8 @@ @interface ARTCbcCipher ()
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation NSString (ARTCipherKeyCompatible)
 
 - (NSData *)toData {

Source/ARTEventEmitter.m

@@ -46,12 +46,16 @@ - (NSString *)identification {
 
 #pragma mark - ARTEventListener
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTEventListener ()
 @property (readonly) BOOL invalidated;
 @property (readonly) BOOL timerIsRunning;
 @property (readonly) BOOL hasTimer;
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTEventListener {
     NSNotificationCenter *_center;
     __weak ARTEventEmitter *_eventHandler; // weak because eventEmitter owns self

Source/ARTFallback.m

@@ -10,10 +10,14 @@
     }
 };
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTFallback ()
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTFallback
 
 - (instancetype)initWithFallbackHosts:(nullable NSArray<NSString *> *)fallbackHosts shuffleArray:(void (^)(NSMutableArray *))shuffleArray {

Source/ARTGCD.m

@@ -1,12 +1,16 @@
 #import "ARTGCD.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTScheduledBlockHandle ()
 
 // Mark this as `atomic` to syncronize access to it from `_scheduledBlock` and `cancel`.
 @property (atomic, copy, nullable) dispatch_block_t block;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTScheduledBlockHandle {
     dispatch_block_t _scheduledBlock;
 }

Source/ARTHttp.m

@@ -3,12 +3,16 @@
 #import "ARTConstants.h"
 #import "ARTInternalLog.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTHttp ()
 
 @property (readonly, nonatomic) id<ARTURLSession> urlSession;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 Class configuredUrlSessionClass = nil;
 
 #pragma mark - ARTHttp

Source/ARTLocalDevice.m

@@ -40,12 +40,16 @@
     return [ARTAPNSDeviceTokenKey stringByAppendingFormat:@"-%@", tokenType ?: ARTAPNSDeviceDefaultTokenType];
 }
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTLocalDevice ()
 
 @property (nullable, nonatomic, readonly) ARTInternalLog *logger;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTLocalDevice
 
 - (instancetype)initWithStorage:(id<ARTDeviceStorage>)storage logger:(nullable ARTInternalLog *)logger {

Source/ARTRealtime.m

@@ -57,12 +57,16 @@
 #import "ARTWrapperSDKProxyRealtime+Private.h"
 #import "ARTConnectionDetails+Private.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTConnectionStateChange ()
 
 - (void)setRetryIn:(NSTimeInterval)retryIn;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 #pragma mark - ARTRealtime implementation
 
 @implementation ARTRealtime {

Source/ARTRealtimeAnnotations.m

@@ -79,12 +79,16 @@ - (void)unsubscribe:(NSString *)type listener:(ARTEventListener *)listener {
 
 #pragma mark - ARTRealtimeAnnotationsInternal
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTRealtimeAnnotationsInternal ()
 
-@property (nonnull, nonatomic, readonly) ARTInternalLog *logger;
+@property (nonatomic, readonly) ARTInternalLog *logger;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTRealtimeAnnotationsInternal {
     __weak ARTRealtimeChannelInternal *_channel; // weak because channel owns self
     __weak ARTRealtimeInternal *_realtime;

Source/ARTRealtimeChannel.m

@@ -269,6 +269,8 @@ - (void)setOptions:(ARTRealtimeChannelOptions *_Nullable)options callback:(nulla
 
 @end
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTRealtimeChannelInternal () {
     ARTRealtimePresenceInternal *_realtimePresence;
     ARTRealtimeAnnotationsInternal *_realtimeAnnotations;
@@ -285,8 +287,6 @@ @interface ARTRealtimeChannelInternal () {
 
 @end
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface ARTRealtimeChannelInternal ()
 
 @property (nonatomic, readonly) ARTAttachRetryState *attachRetryState;

Source/ARTRealtimeChannels.m

@@ -50,6 +50,8 @@ - (void)release:(NSString *)name {
 
 @end
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTRealtimeChannelsInternal ()
 
 @property (nonatomic, readonly) ARTInternalLog *logger;
@@ -60,6 +62,8 @@ @interface ARTRealtimeChannelsInternal ()
 @interface ARTRealtimeChannelsInternal () <ARTChannelsDelegate>
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTRealtimeChannelsInternal {
     ARTChannels *_channels;
     dispatch_queue_t _userQueue;

Source/ARTSummaryTypes.m

@@ -3,8 +3,10 @@
 #import "ARTNSDictionary+ARTDictionaryUtil.h"
 #import "ARTMessageAnnotations.h"
 
+NS_ASSUME_NONNULL_BEGIN
 @interface ARTSummaryClientIdList () <ARTDictionarySerializable>
 @end
+NS_ASSUME_NONNULL_END
 
 @implementation ARTSummaryClientIdList
 
@@ -75,8 +77,10 @@ - (NSString *)description {
 
 @end
 
+NS_ASSUME_NONNULL_BEGIN
 @interface ARTSummaryClientIdCounts () <ARTDictionarySerializable>
 @end
+NS_ASSUME_NONNULL_END
 
 @implementation ARTSummaryClientIdCounts
 
@@ -173,8 +177,10 @@ - (NSString *)description {
 
 @end
 
+NS_ASSUME_NONNULL_BEGIN
 @interface ARTSummaryTotal () <ARTDictionarySerializable>
 @end
+NS_ASSUME_NONNULL_END
 
 @implementation ARTSummaryTotal
 

Source/ARTTypes.m

@@ -384,13 +384,17 @@ + (NSDate *)art_dateWithMillisecondsSince1970:(uint64_t)msecs {
 
 @end
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTCancellableFromCallback : NSObject<ARTCancellable>
 +(instancetype)new NS_UNAVAILABLE;
 -(instancetype)init NS_UNAVAILABLE;
 -(instancetype)initWithCallback:(ARTResultCallback)callback;
 @property(nonatomic, readonly) ARTResultCallback wrapper;
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTCancellableFromCallback {
     id _lock;
 

Source/ARTURLSessionServerTrust.m

@@ -1,13 +1,17 @@
 #import "ARTURLSessionServerTrust.h"
 #import "ARTGCD.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTURLSessionServerTrust() {
     NSURLSession *_session;
     dispatch_queue_t _queue;
 }
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 @implementation ARTURLSessionServerTrust
 
 - (instancetype)init:(dispatch_queue_t)queue {

Source/PrivateHeaders/Ably/ARTBaseMessage+Private.h

@@ -9,8 +9,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) BOOL isIdEmpty;
 
-- (id __nonnull)decodeWithEncoder:(ARTDataEncoder*)encoder error:(NSError *__nullable*__nullable)error;
-- (id __nonnull)encodeWithEncoder:(ARTDataEncoder*)encoder error:(NSError *__nullable*__nullable)error;
+- (id)decodeWithEncoder:(ARTDataEncoder *)encoder error:(NSError *_Nullable *_Nullable)error;
+- (id)encodeWithEncoder:(ARTDataEncoder *)encoder error:(NSError *_Nullable *_Nullable)error;
 
 @end
 

Source/PrivateHeaders/Ably/ARTChannelOptions+Private.h

@@ -1,8 +1,12 @@
 #import <Foundation/Foundation.h>
 #import <Ably/ARTChannelOptions.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTChannelOptions ()
 
 @property (nonatomic, getter=isFrozen) BOOL frozen;
 
 @end
+
+NS_ASSUME_NONNULL_END

Source/PrivateHeaders/Ably/ARTConstants.h

@@ -1,5 +1,9 @@
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString *const ARTHttpHeaderFieldErrorCodeKey;
 extern NSString *const ARTHttpHeaderFieldErrorMessageKey;
 extern NSUInteger const ARTIdempotentLibraryGeneratedIdLength;
+
+NS_ASSUME_NONNULL_END

Source/PrivateHeaders/Ably/ARTDefault+Private.h

@@ -1,5 +1,7 @@
 #import <Ably/ARTDefault.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString *const ARTDefaultProduction;
 
 @interface ARTDefault (Private)
@@ -11,3 +13,5 @@ extern NSString *const ARTDefaultProduction;
 + (NSInteger)maxProductionMessageSize;
 
 @end
+
+NS_ASSUME_NONNULL_END

Source/PrivateHeaders/Ably/ARTJsonEncoder.h

@@ -2,6 +2,10 @@
 
 #import "ARTJsonLikeEncoder.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTJsonEncoder : NSObject <ARTJsonLikeEncoderDelegate>
 
 @end
+
+NS_ASSUME_NONNULL_END

Source/PrivateHeaders/Ably/ARTMsgPackEncoder.h

@@ -2,6 +2,10 @@
 
 #import "ARTJsonLikeEncoder.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ARTMsgPackEncoder : NSObject <ARTJsonLikeEncoderDelegate>
 
 @end
+
+NS_ASSUME_NONNULL_END

Source/PrivateHeaders/Ably/ARTNSArray+ARTFunctional.h

@@ -1,8 +1,12 @@
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface NSArray (ARTFunctional)
 
-- (NSArray *)artMap:(id(^)(id))f;
-- (NSArray *)artFilter:(BOOL(^)(id))f;
+- (NSArray *)artMap:(id (^)(id))f;
+- (NSArray *)artFilter:(BOOL (^)(id))f;
 
 @end
+
+NS_ASSUME_NONNULL_END

Source/PrivateHeaders/Ably/ARTNSDate+ARTUtil.h

@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface NSDate (ARTUtil)
 
 + (instancetype)artDateFromNumberMs:(NSNumber *)number;
@@ -9,3 +11,5 @@
 - (NSInteger)artToIntegerMs;
 
 @end
+
+NS_ASSUME_NONNULL_END