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

Merge branch 'krille/syncerror' into 'main' 

fix: Sync error handling

See merge request famedly/famedlysdk!658
This commit is contained in:
Sorunome 2021-02-26 11:54:37 +00:00
parent 62ad8569ae 29d0e673e0
commit 4f9243915a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/src/client.dart
View File

@ -974,10 +974,13 @@ class Client extends MatrixApi {
since: prevBatch, since: prevBatch,
timeout: prevBatch != null ? 30000 : null, timeout: prevBatch != null ? 30000 : null,
setPresence: syncPresence, setPresence: syncPresence,
).catchError((e) => syncError = e); ).catchError((e) {
syncError = e;
return null;
});
_currentSyncId = syncRequest.hashCode; _currentSyncId = syncRequest.hashCode;
final syncResp = await syncRequest; final syncResp = await syncRequest;
if (syncError != null) throw syncError; if (syncResp == null) throw syncError ?? 'Unknown sync error';
if (_currentSyncId != syncRequest.hashCode) { if (_currentSyncId != syncRequest.hashCode) {
Logs() Logs()
.w('Current sync request ID has changed. Dropping this sync loop!'); .w('Current sync request ID has changed. Dropping this sync loop!');
@ -1021,7 +1024,7 @@ class Client extends MatrixApi {
clear(); clear();
} }
} on MatrixConnectionException catch (e, s) { } on MatrixConnectionException catch (e, s) {
Logs().w('Synchronization connection failed', e); Logs().w('Synchronization connection failed');
onSyncError.add(SdkError(exception: e, stackTrace: s)); onSyncError.add(SdkError(exception: e, stackTrace: s));
} catch (e, s) { } catch (e, s) {
if (!isLogged() || _disposed || _aborted) return; if (!isLogged() || _disposed || _aborted) return;