OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: use map entry with explicit types over cast

This commit is contained in:
Nicolas Werner 2021-09-30 14:26:19 +02:00
parent 6f7f7100e1
commit 71e5ec1bb5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/encryption/utils/session_key.dart
View File

@ -78,7 +78,7 @@ class SessionKey {
: key = key, : key = key,
content = Event.getMapFromPayload(dbEntry.content), content = Event.getMapFromPayload(dbEntry.content),
indexes = Event.getMapFromPayload(dbEntry.indexes) indexes = Event.getMapFromPayload(dbEntry.indexes)
.catchMap((k, v) => MapEntry(k, v as String)), .catchMap((k, v) => MapEntry<String, String>(k, v)),
allowedAtIndex = Event.getMapFromPayload(dbEntry.allowedAtIndex) allowedAtIndex = Event.getMapFromPayload(dbEntry.allowedAtIndex)
.catchMap((k, v) => MapEntry(k, Map<String, int>.from(v))), .catchMap((k, v) => MapEntry(k, Map<String, int>.from(v))),
roomId = dbEntry.roomId, roomId = dbEntry.roomId,
@ -87,13 +87,13 @@ class SessionKey {
inboundGroupSession = olm.InboundGroupSession() { inboundGroupSession = olm.InboundGroupSession() {
final parsedSenderClaimedKeys = final parsedSenderClaimedKeys =
Event.getMapFromPayload(dbEntry.senderClaimedKeys) Event.getMapFromPayload(dbEntry.senderClaimedKeys)
.catchMap((k, v) => MapEntry(k, v as String)); .catchMap((k, v) => MapEntry<String, String>(k, v));
// we need to try...catch as the map used to be <String, int> and that will throw an error. // we need to try...catch as the map used to be <String, int> and that will throw an error.
senderClaimedKeys = (parsedSenderClaimedKeys.isNotEmpty) senderClaimedKeys = (parsedSenderClaimedKeys.isNotEmpty)
? parsedSenderClaimedKeys ? parsedSenderClaimedKeys
: (content['sender_claimed_keys'] is Map : (content['sender_claimed_keys'] is Map
? content['sender_claimed_keys'] ? content['sender_claimed_keys']
.catchMap((k, v) => MapEntry(k, v as String)) .catchMap((k, v) => MapEntry<String, String>(k, v))
: (content['sender_claimed_ed25519_key'] is String : (content['sender_claimed_ed25519_key'] is String
? <String, String>{ ? <String, String>{
'ed25519': content['sender_claimed_ed25519_key'] 'ed25519': content['sender_claimed_ed25519_key']