inex
/
famedlysdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'main' of https://gitlab.com/famedly/famedlysdk into yiffed

This commit is contained in:
Inex Code 2020-10-18 03:45:07 +03:00
parent c175674cd8 9632d68b92
commit d9bc92d654
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/matrix_api/model/one_time_keys_claim_response.dart
View File

@ -21,7 +21,7 @@ class OneTimeKeysClaimResponse {
Map<String, Map<String, dynamic>> oneTimeKeys;
OneTimeKeysClaimResponse.fromJson(Map<String, dynamic> json) {
failures = Map<String, dynamic>.from(json['failures']);
failures = Map<String, dynamic>.from(json['failures'] ?? {});
oneTimeKeys = Map<String, Map<String, dynamic>>.from(json['one_time_keys']);
}

17
lib/src/client.dart
View File

@ -533,10 +533,6 @@ class Client extends MatrixApi {
final StreamController<LoginState> onLoginStateChanged =
StreamController.broadcast();
/// Synchronization erros are coming here.
final StreamController<MatrixException> onError =
StreamController.broadcast();
/// Synchronization erros are coming here.
final StreamController<SdkError> onSyncError = StreamController.broadcast();
@ -780,18 +776,17 @@ class Client extends MatrixApi {
encryption.onSync();
}
_retryDelay = Future.value();
} on MatrixException catch (e) {
onError.add(e);
} on MatrixException catch (e, s) {
onSyncError.add(SdkError(exception: e, stackTrace: s));
if (e.error == MatrixError.M_UNKNOWN_TOKEN) {
Logs.warning('The user has been logged out!');
clear();
}
} catch (e, s) {
if (!isLogged() || _disposed) return;
Logs.error('Error during processing events: ' + e.toString(), s);
onSyncError.add(SdkError(
exception: e is Exception ? e : Exception(e), stackTrace: s));
if (e is MatrixException &&
e.errcode == MatrixError.M_UNKNOWN_TOKEN.toString().split('.').last) {
Logs.warning('The user has been logged out!');
clear();
}
}
}