Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove 10s wait on failed initial sync

Browse source
This commit is contained in:
Andy Uhnak 2022-11-10 16:13:12 +00:00
parent 3f3d81b8b6
commit f97903b7f2
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
View file

@ -55,9 +55,6 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
// We will notify user only once on session failure // We will notify user only once on session failure
BOOL notifyOpenSessionFailure; BOOL notifyOpenSessionFailure;
// The timer used to postpone server sync on failure
NSTimer* initialServerSyncTimer;
// Reachability observer // Reachability observer
id reachabilityObserver; id reachabilityObserver;
@ -934,9 +931,6 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
sessionStateObserver = nil; sessionStateObserver = nil;
} }
[initialServerSyncTimer invalidate];
initialServerSyncTimer = nil;
if (userUpdateListener) if (userUpdateListener)
{ {
[mxSession.myUser removeListener:userUpdateListener]; [mxSession.myUser removeListener:userUpdateListener];
@ -1136,8 +1130,6 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
// Cancel pending actions // Cancel pending actions
[[NSNotificationCenter defaultCenter] removeObserver:reachabilityObserver]; [[NSNotificationCenter defaultCenter] removeObserver:reachabilityObserver];
reachabilityObserver = nil; reachabilityObserver = nil;
[initialServerSyncTimer invalidate];
initialServerSyncTimer = nil;
MXLogDebug(@"[MXKAccount] Pause is delayed due to the session state: %@", [MXTools readableSessionState: mxSession.state]); MXLogDebug(@"[MXKAccount] Pause is delayed due to the session state: %@", [MXTools readableSessionState: mxSession.state]);
} }
@ -1627,8 +1619,6 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
// Cancel potential reachability observer and pending action // Cancel potential reachability observer and pending action
[[NSNotificationCenter defaultCenter] removeObserver:reachabilityObserver]; [[NSNotificationCenter defaultCenter] removeObserver:reachabilityObserver];
reachabilityObserver = nil; reachabilityObserver = nil;
[initialServerSyncTimer invalidate];
initialServerSyncTimer = nil;
// Sanity check // Sanity check
if (!mxSession || (mxSession.state != MXSessionStateStoreDataReady && mxSession.state != MXSessionStateInitialSyncFailed)) if (!mxSession || (mxSession.state != MXSessionStateStoreDataReady && mxSession.state != MXSessionStateInitialSyncFailed))
@ -1694,9 +1684,8 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
if (networkReachabilityManager.isReachable) if (networkReachabilityManager.isReachable)
{ {
// The problem is not the network // If we have network, we retry immediately, otherwise the server may clear any cache it has computed thus far
// Postpone a new attempt in 10 sec [self launchInitialServerSync];
self->initialServerSyncTimer = [NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(launchInitialServerSync) userInfo:self repeats:NO];
} }
else else
{ {

2
changelog.d/pr-7068.change Normal file
View file

@ -0,0 +1,2 @@
Initial sync: Remove 10s wait on failed initial sync