diff --git a/Podfile b/Podfile index 8979b2287..762e89616 100644 --- a/Podfile +++ b/Podfile @@ -21,7 +21,6 @@ pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :br # Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder #pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec' #pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec' -#pod 'libPhoneNumber-iOS', '~> 0.7.6' pod 'GBDeviceInfo', '~> 2.2.9' diff --git a/matrixConsole/AppDelegate.m b/matrixConsole/AppDelegate.m index 06de2b869..cd4580864 100644 --- a/matrixConsole/AppDelegate.m +++ b/matrixConsole/AppDelegate.m @@ -252,8 +252,8 @@ } // refresh the contacts list - [MXKContactManager sharedManager].enableFullMatrixIdSyncOnContactsDidLoad = NO; - [[MXKContactManager sharedManager] loadContacts]; + [MXKContactManager sharedManager].enableFullMatrixIdSyncOnLocalContactsDidLoad = NO; + [[MXKContactManager sharedManager] loadLocalContacts]; _isAppForeground = YES; diff --git a/matrixConsole/ViewController/ContactsViewController.m b/matrixConsole/ViewController/ContactsViewController.m index 2a874596b..e42a775be 100644 --- a/matrixConsole/ViewController/ContactsViewController.m +++ b/matrixConsole/ViewController/ContactsViewController.m @@ -50,10 +50,8 @@ NSString *const kInvitationMessage = @"I'd like to chat with you with matrix. Pl self.delegate = self; } -- (void)reset +- (void)destroy { - [super reset]; - if (self.startChatMenu) { [self.startChatMenu dismiss:NO]; @@ -64,6 +62,8 @@ NSString *const kInvitationMessage = @"I'd like to chat with you with matrix. Pl } selectedContact = nil; + + [super destroy]; } #pragma mark - Actions