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

Merge branch 'krille/olmerrorhandling' into 'main' 

change: Olm exception handling

See merge request famedly/famedlysdk!633
This commit is contained in:
Sorunome 2021-02-03 10:09:43 +00:00
parent 1236e0bec2 9fac03639e
commit 650484c306
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/encryption/encryption.dart
View File

@ -392,7 +392,8 @@ class DecryptException implements Exception {
DecryptException(this.cause, [this.libolmMessage]); DecryptException(this.cause, [this.libolmMessage]);
@override @override
String toString() => cause; String toString() =>
cause + (libolmMessage != null ? ': $libolmMessage' : '');
static const String notEnabled = 'Encryption is not enabled in your client.'; static const String notEnabled = 'Encryption is not enabled in your client.';
static const String unknownAlgorithm = 'Unknown encryption algorithm.'; static const String unknownAlgorithm = 'Unknown encryption algorithm.';

1
lib/encryption/olm_manager.dart
View File

@ -305,6 +305,7 @@ class OlmManager {
try { try {
plaintext = session.session.decrypt(type, body); plaintext = session.session.decrypt(type, body);
} catch (e) { } catch (e) {
// The message was encrypted during this session, but is unable to decrypt
throw DecryptException( throw DecryptException(
DecryptException.decryptionFailed, e.toString()); DecryptException.decryptionFailed, e.toString());
} }