Merge branch 'main' into feature/ably-instance-store-concurrency

Author: QuintinWillison

ios/Classes/codec/AblyFlutterWriter.m

@@ -87,7 +87,7 @@ - (void)writeValue:(id)value {
 }
 
 #define WRITE_VALUE(DICTIONARY, JSON_KEY, VALUE) { \
-if (VALUE) { \
+if ( (VALUE) != nil ) { \
 [DICTIONARY setObject:VALUE forKey:JSON_KEY]; \
 } \
 }
@@ -228,7 +228,7 @@ +(NSString *) encodeChannelEvent: (ARTChannelEvent) event {
                 TxChannelStateChange_event,
                 [AblyFlutterWriter encodeChannelEvent: [stateChange event]]);
 
-    WRITE_VALUE(dictionary, TxChannelStateChange_resumed, [stateChange resumed]?@([stateChange resumed]):nil);
+    WRITE_VALUE(dictionary, TxChannelStateChange_resumed, [NSNumber numberWithBool: [stateChange resumed]]);
     WRITE_VALUE(dictionary, TxChannelStateChange_reason, encodeErrorInfo([stateChange reason]));
     return dictionary;
 };

lib/src/platform/src/codec.dart

@@ -1014,7 +1014,7 @@ class Codec extends StandardMessageCodec {
         _readFromJson<String>(jsonMap, TxChannelStateChange.previous));
     final event = _decodeChannelEvent(
         _readFromJson<String>(jsonMap, TxChannelStateChange.event));
-    final resumed = _readFromJson<bool>(jsonMap, TxChannelStateChange.resumed);
+    final resumed = _readFromJson<bool>(jsonMap, TxChannelStateChange.resumed)!;
     final errorInfo =
         toJsonMap(_readFromJson<Map>(jsonMap, TxChannelStateChange.reason));
     final reason = (errorInfo == null) ? null : _decodeErrorInfo(errorInfo);

lib/src/realtime/src/channel_state_event.dart

@@ -30,7 +30,7 @@ class ChannelStateChange {
   ErrorInfo? reason;
 
   /// https://docs.ably.com/client-lib-development-guide/features/#TH4
-  final bool? resumed;
+  final bool resumed;
 
   /// initializes with [resumed] set to false
   ChannelStateChange(