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

Merge branch 'krille/fix-get-push-rules' into 'main' 

fix: Get push rules crashes if malformed

See merge request famedly/company/frontend/famedlysdk!1124
This commit is contained in:
Nicolas Werner 2022-09-09 10:14:35 +00:00
parent 94397e3cb9 9a8da3c1e6
commit 2b58ec2902
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/client.dart
View File

@ -993,13 +993,17 @@ class Client extends MatrixApi {
/// Returns the global push rules for the logged in user. /// Returns the global push rules for the logged in user.
PushRuleSet? get globalPushRules { PushRuleSet? get globalPushRules {
final pushrules = _accountData['m.push_rules']?.content['global']; final pushrules = _accountData['m.push_rules']
?.content
.tryGetMap<String, dynamic>('global');
return pushrules != null ? PushRuleSet.fromJson(pushrules) : null; return pushrules != null ? PushRuleSet.fromJson(pushrules) : null;
} }
/// Returns the device push rules for the logged in user. /// Returns the device push rules for the logged in user.
PushRuleSet? get devicePushRules { PushRuleSet? get devicePushRules {
final pushrules = _accountData['m.push_rules']?.content['device']; final pushrules = _accountData['m.push_rules']
?.content
.tryGetMap<String, dynamic>('device');
return pushrules != null ? PushRuleSet.fromJson(pushrules) : null; return pushrules != null ? PushRuleSet.fromJson(pushrules) : null;
} }