Merge pull request #153 from matrix-org/vector_506

Should fix - Sync has got stuck while the app was backgrounded
matrix-org · Aug 25, 2016 · a63973b · a63973b
2 parents 6dac73d + bf09b55
commit a63973b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/MatrixKit/Models/Account/MXKAccount.m b/MatrixKit/Models/Account/MXKAccount.m
@@ -641,8 +641,9 @@ - (void)pauseInBackgroundTask
         [initialServerSyncTimer invalidate];
         initialServerSyncTimer = nil;
 
-        if (mxSession.state == MXSessionStateSyncInProgress)
+        if (mxSession.state == MXSessionStateSyncInProgress || mxSession.state == MXSessionStateInitialised || mxSession.state == MXSessionStateStoreDataReady)
         {
+            NSLog(@"[MXKAccount] Pause is delayed at the end of sync (current state %tu)", mxSession.state);
             isPauseRequested = YES;
         }
     }
@@ -984,6 +985,7 @@ - (void)onMatrixSessionStateChange
         // Check if pause has been requested
         if (isPauseRequested)
         {
+            NSLog(@"[MXKAccount] Apply the pending pause.");
             [self pauseInBackgroundTask];
             return;
         }