Merge pull request #5949 from vector-im/langleyd/5948_fix_launch_stuck

We should always reset `listenForRoomListDataReady` for a session sta…
This commit is contained in:
David Langley 2022-03-30 12:04:55 +01:00 committed by GitHub
commit 8e795eff97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions

View file

@ -2417,6 +2417,18 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
if (mainSession) if (mainSession)
{ {
switch (mainSession.state)
{
case MXSessionStateClosed:
case MXSessionStateInitialised:
case MXSessionStateBackgroundSyncInProgress:
self.roomListDataReady = NO;
[self listenForRoomListDataReady];
default:
break;
}
BOOL isLaunching = NO; BOOL isLaunching = NO;
if (_masterTabBarController.isOnboardingInProgress) if (_masterTabBarController.isOnboardingInProgress)
@ -2434,8 +2446,6 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
case MXSessionStateClosed: case MXSessionStateClosed:
case MXSessionStateInitialised: case MXSessionStateInitialised:
case MXSessionStateBackgroundSyncInProgress: case MXSessionStateBackgroundSyncInProgress:
self.roomListDataReady = NO;
[self listenForRoomListDataReady];
isLaunching = YES; isLaunching = YES;
break; break;
case MXSessionStateStoreDataReady: case MXSessionStateStoreDataReady:

1
changelog.d/5948.bugfix Normal file
View file

@ -0,0 +1 @@
Fix for app occasionally getting stuck during launch after Login/Register.