From c73b7631f534cd507faa16fcd777d7f3e9bb9683 Mon Sep 17 00:00:00 2001 From: Lukas Lihotzki Date: Tue, 3 Aug 2021 16:10:55 +0200 Subject: [PATCH] fix: tryGet log levels --- .../events/forwarded_room_key_content.dart | 9 +++-- lib/src/model/events/image_pack_content.dart | 40 ++++++++----------- .../model/events/olm_plaintext_payload.dart | 12 +++--- .../model/events/room_encrypted_content.dart | 8 ++-- .../model/events/room_encryption_content.dart | 7 ++-- lib/src/model/events/room_key_content.dart | 8 ++-- .../events/room_key_request_content.dart | 17 ++++---- .../secret_storage_default_key_content.dart | 2 +- .../events/secret_storage_key_content.dart | 16 ++++---- lib/src/model/events/tombstone_content.dart | 5 ++- 10 files changed, 59 insertions(+), 65 deletions(-) diff --git a/lib/src/model/events/forwarded_room_key_content.dart b/lib/src/model/events/forwarded_room_key_content.dart index b4ec3232..46196692 100644 --- a/lib/src/model/events/forwarded_room_key_content.dart +++ b/lib/src/model/events/forwarded_room_key_content.dart @@ -36,11 +36,12 @@ class ForwardedRoomKeyContent extends RoomKeyContent { List forwardingCurve25519KeyChain; ForwardedRoomKeyContent.fromJson(Map json) - : senderKey = json.tryGet('sender_key') ?? '', + : senderKey = json.tryGet('sender_key', TryGet.required) ?? '', senderClaimedEd25519Key = - json.tryGet('sender_claimed_ed25519_key') ?? '', - forwardingCurve25519KeyChain = - json.tryGetList('forwarding_curve25519_key_chain') ?? [], + json.tryGet('sender_claimed_ed25519_key', TryGet.required) ?? '', + forwardingCurve25519KeyChain = json.tryGetList( + 'forwarding_curve25519_key_chain', TryGet.required) ?? + [], super.fromJson(json); @override diff --git a/lib/src/model/events/image_pack_content.dart b/lib/src/model/events/image_pack_content.dart index 6c1ae0af..31923917 100644 --- a/lib/src/model/events/image_pack_content.dart +++ b/lib/src/model/events/image_pack_content.dart @@ -77,22 +77,19 @@ class ImagePackContent { : _json = Map.fromEntries(json.entries.where( (e) => !['images', 'pack', 'emoticons', 'short'].contains(e.key))), pack = ImagePackPackContent.fromJson( - json.tryGetMap('pack', TryGet.optional) ?? {}), - images = json - .tryGetMap('images', TryGet.optional) - ?.catchMap( - (k, v) => MapEntry(k, ImagePackImageContent.fromJson(v))) ?? + json.tryGetMap('pack') ?? {}), + images = json.tryGetMap('images')?.catchMap( + (k, v) => MapEntry(k, ImagePackImageContent.fromJson(v))) ?? // the "emoticons" key needs a small migration on the key, ":string:" --> "string" - json - .tryGetMap('emoticons', TryGet.optional) - ?.catchMap((k, v) => MapEntry( + json.tryGetMap('emoticons')?.catchMap((k, v) => + MapEntry( k.startsWith(':') && k.endsWith(':') ? k.substring(1, k.length - 1) : k, ImagePackImageContent.fromJson(v))) ?? // the "short" key was still just a map from shortcode to mxc uri - json.tryGetMap('short', TryGet.optional)?.catchMap( - (k, v) => MapEntry( + json.tryGetMap('short')?.catchMap((k, v) => + MapEntry( k.startsWith(':') && k.endsWith(':') ? k.substring(1, k.length - 1) : k, @@ -122,10 +119,9 @@ class ImagePackImageContent { : _json = Map.fromEntries(json.entries .where((e) => !['url', 'body', 'info'].contains(e.key))), url = Uri.parse(json['url']), - body = json.tryGet('body', TryGet.optional), - info = json.tryGetMap('info', TryGet.optional), - usage = imagePackUsageFromJson( - json.tryGetList('usage', TryGet.optional)); + body = json.tryGet('body'), + info = json.tryGetMap('info'), + usage = imagePackUsageFromJson(json.tryGetList('usage')); Map toJson() { return { @@ -134,8 +130,7 @@ class ImagePackImageContent { if (body != null) 'body': body, if (info != null) 'info': info, if (usage != null) - 'usage': imagePackUsageToJson( - usage, _json.tryGetList('usage', TryGet.optional)), + 'usage': imagePackUsageToJson(usage, _json.tryGetList('usage')), }; } } @@ -156,13 +151,11 @@ class ImagePackPackContent { ImagePackPackContent.fromJson(Map json) : _json = Map.fromEntries(json.entries.where((e) => !['display_name', 'avatar_url', 'attribution'].contains(e.key))), - displayName = json.tryGet('display_name', TryGet.optional), + displayName = json.tryGet('display_name'), // we default to an invalid uri - avatarUrl = - Uri.tryParse(json.tryGet('avatar_url', TryGet.optional) ?? '.::'), - usage = imagePackUsageFromJson( - json.tryGetList('usage', TryGet.optional)), - attribution = json.tryGet('attribution', TryGet.optional); + avatarUrl = Uri.tryParse(json.tryGet('avatar_url') ?? '.::'), + usage = imagePackUsageFromJson(json.tryGetList('usage')), + attribution = json.tryGet('attribution'); Map toJson() { return { @@ -170,8 +163,7 @@ class ImagePackPackContent { if (displayName != null) 'display_name': displayName, if (avatarUrl != null) 'avatar_url': avatarUrl.toString(), if (usage != null) - 'usage': imagePackUsageToJson( - usage, _json.tryGetList('usage', TryGet.optional)), + 'usage': imagePackUsageToJson(usage, _json.tryGetList('usage')), if (attribution != null) 'attribution': attribution, }; } diff --git a/lib/src/model/events/olm_plaintext_payload.dart b/lib/src/model/events/olm_plaintext_payload.dart index 5f67ca1b..fe7e0611 100644 --- a/lib/src/model/events/olm_plaintext_payload.dart +++ b/lib/src/model/events/olm_plaintext_payload.dart @@ -42,12 +42,12 @@ class OlmPlaintextPayload { factory OlmPlaintextPayload.fromJson(Map json) => OlmPlaintextPayload( - sender: json.tryGet('sender'), - type: json.tryGet('type'), - content: json.tryGetMap('content'), - recipient: json.tryGet('recipient'), - recipientKeys: json.tryGetMap('recipient_keys'), - keys: json.tryGetMap('keys'), + sender: json.tryGet('sender', TryGet.required), + type: json.tryGet('type', TryGet.required), + content: json.tryGetMap('content', TryGet.required), + recipient: json.tryGet('recipient', TryGet.required), + recipientKeys: json.tryGetMap('recipient_keys', TryGet.required), + keys: json.tryGetMap('keys', TryGet.required), ); Map toJson() { diff --git a/lib/src/model/events/room_encrypted_content.dart b/lib/src/model/events/room_encrypted_content.dart index 4e348704..a358dc9f 100644 --- a/lib/src/model/events/room_encrypted_content.dart +++ b/lib/src/model/events/room_encrypted_content.dart @@ -41,10 +41,10 @@ class RoomEncryptedContent { Map? ciphertextOlm; RoomEncryptedContent.fromJson(Map json) - : algorithm = json.tryGet('algorithm') ?? '', - senderKey = json.tryGet('sender_key') ?? '', - deviceId = json.tryGet('device_id', TryGet.optional), - sessionId = json.tryGet('session_id', TryGet.optional), + : algorithm = json.tryGet('algorithm', TryGet.required) ?? '', + senderKey = json.tryGet('sender_key', TryGet.required) ?? '', + deviceId = json.tryGet('device_id'), + sessionId = json.tryGet('session_id'), ciphertextMegolm = json.tryGet('ciphertext', TryGet.silent), // filter out invalid/incomplete CiphertextInfos ciphertextOlm = json diff --git a/lib/src/model/events/room_encryption_content.dart b/lib/src/model/events/room_encryption_content.dart index 41173856..24262320 100644 --- a/lib/src/model/events/room_encryption_content.dart +++ b/lib/src/model/events/room_encryption_content.dart @@ -35,10 +35,9 @@ class RoomEncryptionContent { int? rotationPeriodMsgs; RoomEncryptionContent.fromJson(Map json) - : algorithm = json.tryGet('algorithm') ?? '', - rotationPeriodMs = json.tryGet('rotation_period_ms', TryGet.optional), - rotationPeriodMsgs = - json.tryGet('rotation_period_msgs', TryGet.optional); + : algorithm = json.tryGet('algorithm', TryGet.required) ?? '', + rotationPeriodMs = json.tryGet('rotation_period_ms'), + rotationPeriodMsgs = json.tryGet('rotation_period_msgs'); Map toJson() { final data = {}; diff --git a/lib/src/model/events/room_key_content.dart b/lib/src/model/events/room_key_content.dart index e179e662..e8c69893 100644 --- a/lib/src/model/events/room_key_content.dart +++ b/lib/src/model/events/room_key_content.dart @@ -41,10 +41,10 @@ class RoomKeyContent { required this.sessionKey}); RoomKeyContent.fromJson(Map json) - : algorithm = json.tryGet('algorithm') ?? '', - roomId = json.tryGet('room_id') ?? '', - sessionId = json.tryGet('session_id') ?? '', - sessionKey = json.tryGet('session_key') ?? ''; + : algorithm = json.tryGet('algorithm', TryGet.required) ?? '', + roomId = json.tryGet('room_id', TryGet.required) ?? '', + sessionId = json.tryGet('session_id', TryGet.required) ?? '', + sessionKey = json.tryGet('session_key', TryGet.required) ?? ''; Map toJson() { final data = {}; diff --git a/lib/src/model/events/room_key_request_content.dart b/lib/src/model/events/room_key_request_content.dart index 53f5597d..5599cc03 100644 --- a/lib/src/model/events/room_key_request_content.dart +++ b/lib/src/model/events/room_key_request_content.dart @@ -37,10 +37,11 @@ class RoomKeyRequestContent { RoomKeyRequestContent.fromJson(Map json) : body = ((x) => x != null ? RequestedKeyInfo.fromJson(x) : null)( - json.tryGet('body', TryGet.optional)), - action = json.tryGet('action') ?? '', - requestingDeviceId = json.tryGet('requesting_device_id') ?? '', - requestId = json.tryGet('request_id') ?? ''; + json.tryGet('body')), + action = json.tryGet('action', TryGet.required) ?? '', + requestingDeviceId = + json.tryGet('requesting_device_id', TryGet.required) ?? '', + requestId = json.tryGet('request_id', TryGet.required) ?? ''; Map toJson() { final data = {}; @@ -65,10 +66,10 @@ class RequestedKeyInfo { required this.senderKey}); RequestedKeyInfo.fromJson(Map json) - : algorithm = json.tryGet('algorithm') ?? '', - roomId = json.tryGet('room_id') ?? '', - sessionId = json.tryGet('session_id') ?? '', - senderKey = json.tryGet('sender_key') ?? ''; + : algorithm = json.tryGet('algorithm', TryGet.required) ?? '', + roomId = json.tryGet('room_id', TryGet.required) ?? '', + sessionId = json.tryGet('session_id', TryGet.required) ?? '', + senderKey = json.tryGet('sender_key', TryGet.required) ?? ''; Map toJson() { final data = {}; diff --git a/lib/src/model/events/secret_storage_default_key_content.dart b/lib/src/model/events/secret_storage_default_key_content.dart index 470538d4..198f6e7d 100644 --- a/lib/src/model/events/secret_storage_default_key_content.dart +++ b/lib/src/model/events/secret_storage_default_key_content.dart @@ -36,7 +36,7 @@ class SecretStorageDefaultKeyContent { SecretStorageDefaultKeyContent({required this.key}); SecretStorageDefaultKeyContent.fromJson(Map json) - : key = json.tryGet('key'); + : key = json.tryGet('key', TryGet.required); Map toJson() { final data = {}; diff --git a/lib/src/model/events/secret_storage_key_content.dart b/lib/src/model/events/secret_storage_key_content.dart index de42a723..d748da34 100644 --- a/lib/src/model/events/secret_storage_key_content.dart +++ b/lib/src/model/events/secret_storage_key_content.dart @@ -39,10 +39,10 @@ class SecretStorageKeyContent { SecretStorageKeyContent.fromJson(Map json) : passphrase = ((x) => x != null ? PassphraseInfo.fromJson(x) : null)( - json.tryGet('passphrase', TryGet.optional)), - iv = json.tryGet('iv', TryGet.optional), - mac = json.tryGet('mac', TryGet.optional), - algorithm = json.tryGet('algorithm', TryGet.optional); + json.tryGet('passphrase')), + iv = json.tryGet('iv'), + mac = json.tryGet('mac'), + algorithm = json.tryGet('algorithm'); Map toJson() { final data = {}; @@ -69,10 +69,10 @@ class PassphraseInfo { this.bits}); PassphraseInfo.fromJson(Map json) - : algorithm = json.tryGet('algorithm'), - salt = json.tryGet('salt'), - iterations = json.tryGet('iterations'), - bits = json.tryGet('bits', TryGet.optional); + : algorithm = json.tryGet('algorithm', TryGet.required), + salt = json.tryGet('salt', TryGet.required), + iterations = json.tryGet('iterations', TryGet.required), + bits = json.tryGet('bits'); Map toJson() { final data = {}; diff --git a/lib/src/model/events/tombstone_content.dart b/lib/src/model/events/tombstone_content.dart index 18804448..926db2fc 100644 --- a/lib/src/model/events/tombstone_content.dart +++ b/lib/src/model/events/tombstone_content.dart @@ -34,8 +34,9 @@ class TombstoneContent { String replacementRoom; TombstoneContent.fromJson(Map json) - : body = json.tryGet('body') ?? '', - replacementRoom = json.tryGet('replacement_room') ?? ''; + : body = json.tryGet('body', TryGet.required) ?? '', + replacementRoom = + json.tryGet('replacement_room', TryGet.required) ?? ''; Map toJson() { final data = {};