Removed asQueryItems: towards more simple asQueryParams.

Author: maratal

Source/ARTDataQuery.m

@@ -22,24 +22,8 @@ - (instancetype)init {
     }
 }
 
-- (NSMutableArray *)asQueryItems:(NSError *_Nullable*)error {
-    NSMutableArray *items = [NSMutableArray array];
-
-    if (self.start) {
-        [items addObject:[NSURLQueryItem queryItemWithName:@"start" value:[NSString stringWithFormat:@"%llu", dateToMilliseconds(self.start)]]];
-    }
-    if (self.end) {
-        [items addObject:[NSURLQueryItem queryItemWithName:@"end" value:[NSString stringWithFormat:@"%llu", dateToMilliseconds(self.end)]]];
-    }
-
-    [items addObject:[NSURLQueryItem queryItemWithName:@"limit" value:[NSString stringWithFormat:@"%hu", self.limit]]];
-    [items addObject:[NSURLQueryItem queryItemWithName:@"direction" value:queryDirectionToString(self.direction)]];
-
-    return items;
-}
-
 - (NSStringDictionary *)asQueryParams {
-    NSMutableDictionary *items = [NSMutableDictionary dictionary];
+    NSMutableStringDictionary *items = [NSMutableStringDictionary dictionary];
 
     if (self.start) {
         items[@"start"] = [NSString stringWithFormat:@"%llu", dateToMilliseconds(self.start)];
@@ -58,20 +42,10 @@ - (NSStringDictionary *)asQueryParams {
 
 @implementation ARTRealtimeHistoryQuery
 
-- (NSMutableArray *)asQueryItems:(NSError **)errorPtr {
-    NSMutableArray *items = [super asQueryItems:errorPtr];
-    if (*errorPtr) {
-        return nil;
-    }
-    if (self.untilAttach) {
-        NSAssert(self.realtimeChannel, @"ARTRealtimeHistoryQuery used from outside ARTRealtimeChannel.history");
-        if (self.realtimeChannel.state_nosync != ARTRealtimeChannelAttached) {
-            *errorPtr = [NSError errorWithDomain:ARTAblyErrorDomain code:ARTRealtimeHistoryErrorNotAttached userInfo:@{NSLocalizedDescriptionKey:@"ARTRealtimeHistoryQuery: untilAttach used in channel that isn't attached"}];
-            return nil;
-        }
-        [items addObject:[NSURLQueryItem queryItemWithName:@"fromSerial" value:self.realtimeChannel.attachSerial]];
-    }
-    return items;
+- (NSStringDictionary *)asQueryParams {
+    NSMutableStringDictionary *params = super.asQueryParams.mutableCopy;
+    params[@"fromSerial"] = self.realtimeChannelAttachSerial;
+    return params;
 }
 
 @end

Source/ARTRealtimeChannel.m

@@ -1207,8 +1207,15 @@ - (void)historyWithWrapperSDKAgents:(nullable NSStringDictionary *)wrapperSDKAge
     [self history:[[ARTRealtimeHistoryQuery alloc] init] wrapperSDKAgents:wrapperSDKAgents callback:callback error:nil];
 }
 
-- (BOOL)history:(ARTRealtimeHistoryQuery *)query wrapperSDKAgents:(nullable NSStringDictionary *)wrapperSDKAgents callback:(ARTPaginatedMessagesCallback)callback error:(NSError **)errorPtr {
-    query.realtimeChannel = self;
+- (BOOL)history:(ARTRealtimeHistoryQuery *)query
+wrapperSDKAgents:(nullable NSStringDictionary *)wrapperSDKAgents
+       callback:(ARTPaginatedMessagesCallback)callback
+          error:(NSError **)errorPtr {
+    if (query.untilAttach && self.state_nosync != ARTRealtimeChannelAttached) { // RTL10b
+        *errorPtr = [NSError errorWithDomain:ARTAblyErrorDomain code:ARTRealtimeHistoryErrorNotAttached userInfo:@{NSLocalizedDescriptionKey:@"ARTRealtimeHistoryQuery: untilAttach used in channel that isn't attached"}];
+        return false;
+    }
+    query.realtimeChannelAttachSerial = self.attachSerial;
     return [_restChannel history:query wrapperSDKAgents:wrapperSDKAgents callback:callback error:errorPtr];
 }
 

Source/ARTRealtimePresence.m

@@ -279,7 +279,6 @@ - (void)historyWithWrapperSDKAgents:(nullable NSStringDictionary *)wrapperSDKAge
 }
 
 - (BOOL)history:(ARTRealtimeHistoryQuery *)query wrapperSDKAgents:(nullable NSStringDictionary *)wrapperSDKAgents callback:(ARTPaginatedPresenceCallback)callback error:(NSError **)errorPtr {
-    query.realtimeChannel = _channel;
     return [_channel.restChannel.presence history:query wrapperSDKAgents:wrapperSDKAgents callback:callback error:errorPtr];
 }
 

Source/ARTStats.m

@@ -25,15 +25,6 @@ - (instancetype)init {
     }
 }
 
-- (NSMutableArray *)asQueryItems:(NSError **)error {
-    NSMutableArray *items = [super asQueryItems:error];
-    if (*error) {
-        return nil;
-    }
-    [items addObject:[NSURLQueryItem queryItemWithName:@"unit" value:statsUnitToString(self.unit)]];
-    return items;
-}
-
 - (NSStringDictionary *)asQueryParams {
     NSMutableDictionary *items = (NSMutableDictionary *)[super asQueryParams];
     items[@"unit"] = statsUnitToString(self.unit);

Source/PrivateHeaders/Ably/ARTDataQuery+Private.h

@@ -5,15 +5,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ARTDataQuery (Private)
 
-- (nullable NSMutableArray /* <NSURLQueryItem *> */ *)asQueryItems:(NSError *_Nullable *)error;
-
 - (NSStringDictionary *)asQueryParams;
 
 @end
 
 @interface ARTRealtimeHistoryQuery ()
 
-@property (readwrite) ARTRealtimeChannelInternal *realtimeChannel;
+@property (readwrite, copy) NSString *realtimeChannelAttachSerial;
 
 @end
 

Source/PrivateHeaders/Ably/ARTPresence+Private.h

@@ -1,12 +1,6 @@
 #import <Ably/ARTPresence.h>
 #import "ARTChannel.h"
 
-@interface ARTPresenceQuery ()
-
-- (NSMutableArray<NSURLQueryItem *> *)asQueryItems;
-
-@end
-
 @interface ARTPresence ()
 
 @property (readonly, getter=getChannel) ARTChannel *channel;

Source/include/Ably/ARTTypes.h

@@ -188,7 +188,7 @@ typedef NS_ENUM(NSInteger, ARTDataQueryError) {
 /// :nodoc:
 NS_SWIFT_SENDABLE
 typedef NS_ENUM(NSInteger, ARTRealtimeHistoryError) {
-    ARTRealtimeHistoryErrorNotAttached = ARTDataQueryErrorTimestampRange + 1
+    ARTRealtimeHistoryErrorNotAttached = ARTDataQueryErrorTimestampRange + 1 // TODO: overlaps with ARTDataQueryErrorMissingRequiredFields
 };
 
 /// :nodoc:
@@ -480,6 +480,7 @@ NS_SWIFT_SENDABLE
 
 /// :nodoc:
 typedef NSDictionary<NSString *, NSString *> NSStringDictionary;
+typedef NSMutableDictionary<NSString *, NSString *> NSMutableStringDictionary;
 
 // Below are the typedefs of completion handlers to improve readability and maintainability in properties and method parameters.
 // Either result/response or error can be nil but not both.