Merge pull request #140 from matrix-org/vector_623

App crashes when we start a chat during initial sync

Author: manuroe

MatrixSDK/Data/MXUser.h

@@ -92,7 +92,6 @@
  */
 - (void)updateWithRoomMemberEvent:(MXEvent*)roomMemberEvent roomMember:(MXRoomMember *)roomMember inMatrixSession:(MXSession*)mxSession;
 
-
 /**
  Update the MXUser data with a m.presence event.
  
@@ -101,6 +100,15 @@
  */
 - (void)updateWithPresenceEvent:(MXEvent*)presenceEvent inMatrixSession:(MXSession*)mxSession;
 
+/**
+ Make a request to the homeserver to update the MXUser.
+
+ @param mxSession the mxSession to the home server.
+ @param success a block when the operation succeeds.
+ @param failure a block when the operation fails.
+ */
+- (void)updateFromHomeserverOfMatrixSession:(MXSession*)mxSession success:(void (^)())success failure:(void (^)(NSError *error))failure;
+
 
 #pragma mark - Events listeners
 /**

MatrixSDK/Data/MXUser.m

@@ -122,6 +122,31 @@ - (void)updateWithPresenceEvent:(MXEvent*)presenceEvent inMatrixSession:(MXSessi
     [self notifyListeners:presenceEvent];
 }
 
+- (void)updateFromHomeserverOfMatrixSession:(MXSession *)mxSession success:(void (^)())success failure:(void (^)(NSError *))failure
+{
+    [mxSession.matrixRestClient displayNameForUser:_userId success:^(NSString *displayname) {
+
+        [mxSession.matrixRestClient avatarUrlForUser:_userId success:^(NSString *avatarUrl) {
+
+            self.displayname = displayname;
+            self.avatarUrl = avatarUrl;
+
+            success();
+
+            [self notifyListeners:nil];
+
+        } failure:^(NSError *error) {
+
+            NSLog(@"[MXUser] updateFromHomeserverOfMatrixSession. Error when getting avatar: %@", error);
+            failure(error);
+        }];
+    } failure:^(NSError *error) {
+
+        NSLog(@"[MXUser] updateFromHomeserverOfMatrixSession. Error when getting avatar: %@", error);
+        failure(error);
+    }];
+}
+
 - (NSUInteger)lastActiveAgo
 {
     NSUInteger lastActiveAgo = -1;

MatrixSDK/MXSession.m

@@ -227,8 +227,12 @@ -(void)setStore:(id<MXStore>)store success:(void (^)())onStoreDataReady failure:
         }
         else
         {
+            // Create self.myUser instance to expose the user id as soon as possible
+            _myUser = [[MXMyUser alloc] initWithUserId:matrixRestClient.credentials.userId];
+            _myUser.mxSession = self;
+
             NSLog(@"[MXSession] Total time to mount SDK data from MXStore: %.0fms", [[NSDate date] timeIntervalSinceDate:startDate] * 1000);
-            
+
             [self setState:MXSessionStateStoreDataReady];
 
             // The SDK client can use this data
@@ -299,31 +303,19 @@ - (void)startWithMessagesLimit:(NSUInteger)messagesLimit
     {
         // Get data from the home server
         // First of all, retrieve the user's profile information
-        [matrixRestClient displayNameForUser:matrixRestClient.credentials.userId success:^(NSString *displayname) {
+        [_myUser updateFromHomeserverOfMatrixSession:self success:^{
 
-            [matrixRestClient avatarUrlForUser:matrixRestClient.credentials.userId success:^(NSString *avatarUrl) {
-
-                // Create the user's profile
-                _myUser = [[MXMyUser alloc] initWithUserId:matrixRestClient.credentials.userId andDisplayname:displayname andAvatarUrl:avatarUrl];
-                _myUser.mxSession = self;
-
-                // And store him as a common MXUser
-                [_store storeUser:_myUser];
-                    
-                // Initial server sync
-                [self serverSyncWithServerTimeout:0 success:onServerSyncDone failure:^(NSError *error) {
+            // And store him as a common MXUser
+            [_store storeUser:_myUser];
 
-                    [self setState:MXSessionStateInitialSyncFailed];
-                    failure(error);
+            // Initial server sync
+            [self serverSyncWithServerTimeout:0 success:onServerSyncDone failure:^(NSError *error) {
 
-                } clientTimeout:CLIENT_TIMEOUT_MS setPresence:nil];
-
-            } failure:^(NSError *error) {
-                
                 [self setState:MXSessionStateInitialSyncFailed];
                 failure(error);
-                
-            }];
+
+            } clientTimeout:CLIENT_TIMEOUT_MS setPresence:nil];
+
         } failure:^(NSError *error) {
 
             [self setState:MXSessionStateInitialSyncFailed];