Merge remote-tracking branch 'origin/feature/update-ably-cocoa-1.2.6'…

… into feature/ably-agent-header
ably · Oct 27, 2021 · 5367c96 · 5367c96
2 parents cba382f + 49d6687
commit 5367c96
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/lib/src/platform/src/codec.dart b/lib/src/platform/src/codec.dart
@@ -641,13 +641,18 @@ class Codec extends StandardMessageCodec {
 
   /// Decodes value [jsonMap] to [TokenParams]
   /// returns null if [jsonMap] is null
-  TokenParams _decodeTokenParams(Map<String, dynamic> jsonMap) => TokenParams()
-    ..capability = _readFromJson<String>(jsonMap, TxTokenParams.capability)
-    ..clientId = _readFromJson<String>(jsonMap, TxTokenParams.clientId)
-    ..nonce = _readFromJson<String>(jsonMap, TxTokenParams.nonce)
-    ..timestamp = DateTime.fromMillisecondsSinceEpoch(
-        _readFromJson<int>(jsonMap, TxTokenParams.timestamp)!)
-    ..ttl = _readFromJson<int>(jsonMap, TxTokenParams.ttl);
+  TokenParams _decodeTokenParams(Map<String, dynamic> jsonMap) {
+    final timestamp = _readFromJson<int>(jsonMap, TxTokenParams.timestamp);
+    final params = TokenParams()
+      ..capability = _readFromJson<String>(jsonMap, TxTokenParams.capability)
+      ..clientId = _readFromJson<String>(jsonMap, TxTokenParams.clientId)
+      ..nonce = _readFromJson<String>(jsonMap, TxTokenParams.nonce)
+      ..timestamp = (timestamp != null)
+          ? DateTime.fromMillisecondsSinceEpoch(timestamp)
+          : null
+      ..ttl = _readFromJson<int>(jsonMap, TxTokenParams.ttl);
+    return params;
+  }
 
   /// Decodes value [jsonMap] to [AblyMessage]
   /// returns null if [jsonMap] is null