Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(iOS): transportParams serialization #528

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ios/Classes/codec/AblyFlutterReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN

+(ARTTokenDetails *)tokenDetailsFromDictionary: (NSDictionary *) dictionary;
+(ARTTokenParams *)tokenParamsFromDictionary: (NSDictionary *) dictionary;
+(NSDictionary<NSString *, ARTStringifiable *> *)transportParamsFromDictionary: (NSDictionary *) dictionary;

@end

Expand Down
17 changes: 16 additions & 1 deletion ios/Classes/codec/AblyFlutterReader.m
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ use an explicitly received null from Dart (manifesting this side as a nil id)
READ_VALUE(clientOptions, idempotentRestPublishing, dictionary, TxClientOptions_idempotentRestPublishing);
READ_VALUE(clientOptions, fallbackHosts, dictionary, TxClientOptions_fallbackHosts);
READ_VALUE(clientOptions, fallbackHostsUseDefault, dictionary, TxClientOptions_fallbackHostsUseDefault);
READ_VALUE(clientOptions, transportParams, dictionary, TxClientOptions_transportParams);
ON_VALUE(^(const id value) {
clientOptions.transportParams = [AblyFlutterReader transportParamsFromDictionary: value];
}, dictionary, TxClientOptions_transportParams);
ON_VALUE(^(const id value) {
clientOptions.defaultTokenParams = [AblyFlutterReader tokenParamsFromDictionary: value];
}, dictionary, TxClientOptions_defaultTokenParams);
Expand Down Expand Up @@ -245,6 +247,19 @@ +(ARTTokenParams *)tokenParamsFromDictionary: (NSDictionary *) dictionary {
return tokenParams;
}


+(NSDictionary<NSString *, ARTStringifiable *> *)transportParamsFromDictionary: (NSDictionary *) dictionary {
NSMutableDictionary<NSString *, ARTStringifiable *> *result = [NSMutableDictionary dictionary];

for (NSString *key in dictionary) {
NSString *value = dictionary[key];
ARTStringifiable *stringifiable = [[ARTStringifiable alloc] initWithString:value];
result[key] = stringifiable;
}

return [result copy];
}

static AblyCodecDecoder readChannelMessageExtras = ^id<ARTJsonCompatible>(NSDictionary *const dictionary) {
return dictionary[TxMessageExtras_extras];
};
Expand Down
Loading