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

Merge branch 'krille/fix-sync-error' into 'main' 

fix: Dont catch sync errors

See merge request famedly/famedlysdk!656
This commit is contained in:
Marcus 2021-02-18 13:33:54 +00:00
parent fa16efa0c1 c7f78bdaf5
commit b6b6231ca5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/client.dart
View File

@ -951,15 +951,19 @@ class Client extends MatrixApi {
_retryDelay = Future.delayed(Duration(seconds: syncErrorTimeoutSec)); _retryDelay = Future.delayed(Duration(seconds: syncErrorTimeoutSec));
if (!isLogged() || _disposed || _aborted) return null; if (!isLogged() || _disposed || _aborted) return null;
try { try {
var syncError;
final syncRequest = sync( final syncRequest = sync(
filter: syncFilters, filter: syncFilters,
since: prevBatch, since: prevBatch,
timeout: prevBatch != null ? 30000 : null, timeout: prevBatch != null ? 30000 : null,
setPresence: syncPresence, setPresence: syncPresence,
); ).catchError((e) => syncError = e);
_currentSyncId = syncRequest.hashCode; _currentSyncId = syncRequest.hashCode;
final syncResp = await syncRequest; final syncResp = await syncRequest;
if (syncError != null) throw syncError;
if (_currentSyncId != syncRequest.hashCode) { if (_currentSyncId != syncRequest.hashCode) {
Logs()
.w('Current sync request ID has changed. Dropping this sync loop!');
return; return;
} }
if (database != null) { if (database != null) {