Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not retry initial sync on fatal errors #7115

Merged
merged 2 commits into from
Dec 5, 2022
Merged

Do not retry initial sync on fatal errors #7115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b23577
Do not retry initial sync on fatal errors
Anderas Nov 29, 2022
df31c30
Change fatal error range
Anderas Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,9 @@ -(void)openSessionWithStore:(id<MXStore>)store
MXStrongifyAndReturnIfNil(self);
self->mxSession = nil;

NSString *myUserId = self.mxSession.myUser.userId;
[[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];

[[NSNotificationCenter defaultCenter] removeObserver:self->sessionStateObserver];
self->sessionStateObserver = nil;

Expand Down Expand Up @@ -1677,6 +1680,14 @@ - (void)launchInitialServerSync
NSString *myUserId = self.mxSession.myUser.userId;
[[NSNotificationCenter defaultCenter] postNotificationName:kMXKErrorNotification object:error userInfo:myUserId ? @{kMXKErrorUserIdKey: myUserId} : nil];
}

// If we cannot resolve this error by retrying, exit early
BOOL isRetryableError = [error.domain isEqualToString:NSURLErrorDomain] || [MXHTTPOperation urlResponseFromError:error] != nil;
if (!isRetryableError)
{
MXLogDebug(@"[MXKAccount] Initial sync will not be retried");
return;
}

// Check if it is a network connectivity issue
AFNetworkReachabilityManager *networkReachabilityManager = [AFNetworkReachabilityManager sharedManager];
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-7115.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Session: Do not retry initial sync on fatal errors