From 8b6ac135944457b60ebf390ea4dc1b2b85d476dc Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Fri, 21 Nov 2014 11:35:53 +0100 Subject: [PATCH] Fixes InCallViewController & contacts not displayed --- Signal/src/AppDelegate.m | 4 +- Signal/src/environment/Environment.h | 3 +- Signal/src/environment/Environment.m | 9 +--- .../PhoneNumberDirectoryFilterManager.m | 3 +- .../ContactsTableViewController.m | 4 +- .../xibs/DialerViewController.xib | 48 +++++++++---------- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 620620e71..d37230c5f 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -162,6 +162,8 @@ }]; } + [self.window.rootViewController dismissViewControllerAnimated:NO completion:nil]; + [self.window.rootViewController presentViewController:callViewController animated:NO completion:nil]; } onThread:NSThread.mainThread untilCancelled:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Storyboard" bundle:[NSBundle mainBundle]]; @@ -224,7 +226,7 @@ [self removeScreenProtection]; - if (Environment.isRegistered) { + if (Environment.isRedPhoneRegistered) { [PushManager.sharedManager verifyPushPermissions]; [AppAudioManager.sharedInstance requestRequiredPermissionsIfNeeded]; } diff --git a/Signal/src/environment/Environment.h b/Signal/src/environment/Environment.h index 1e0795109..1342a52fa 100644 --- a/Signal/src/environment/Environment.h +++ b/Signal/src/environment/Environment.h @@ -74,8 +74,7 @@ andCurrentRegionCodeForPhoneNumbers:(NSString*)currentRegionCodeForPhoneNumbers +(PropertyListPreferences*)preferences; -+(BOOL)isRegistered; -+(void)setRegistered:(BOOL)status; ++(BOOL)isRedPhoneRegistered; +(void)resetAppData; @end diff --git a/Signal/src/environment/Environment.m b/Signal/src/environment/Environment.m index b7ec65c28..c8c3f971b 100644 --- a/Signal/src/environment/Environment.m +++ b/Signal/src/environment/Environment.m @@ -147,19 +147,14 @@ phoneDirectoryManager; return Environment.getCurrent.logging; } -+(BOOL)isRegistered{ ++(BOOL)isRedPhoneRegistered{ // Attributes that need to be set NSData *signalingKey = SignalKeyingStorage.signalingCipherKey; NSData *macKey = SignalKeyingStorage.signalingMacKey; NSData *extra = SignalKeyingStorage.signalingExtraKey; NSString *serverAuth = SignalKeyingStorage.serverAuthPassword; - BOOL registered = [[NSUserDefaults.standardUserDefaults objectForKey:isRegisteredUserDefaultString] boolValue]; - return signalingKey && macKey && extra && serverAuth && registered; -} - -+(void)setRegistered:(BOOL)status{ - [NSUserDefaults.standardUserDefaults setObject:status?@YES:@NO forKey:isRegisteredUserDefaultString]; + return signalingKey && macKey && extra && serverAuth; } +(PropertyListPreferences*)preferences{ diff --git a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m index 3bc2fa96a..677a1cff9 100644 --- a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m +++ b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m @@ -48,8 +48,9 @@ } -(void) scheduleUpdateAt:(NSDate*)date { void(^doUpdate)(void) = ^{ - if (Environment.isRegistered) { + if (Environment.isRedPhoneRegistered) { [self update]; + } }; diff --git a/Signal/src/view controllers/ContactsTableViewController.m b/Signal/src/view controllers/ContactsTableViewController.m index afa7d1bdd..3182db3f6 100644 --- a/Signal/src/view controllers/ContactsTableViewController.m +++ b/Signal/src/view controllers/ContactsTableViewController.m @@ -308,7 +308,9 @@ static NSString *const CONTACT_BROWSE_TABLE_CELL_IDENTIFIER = @"ContactTableView } - (void)refreshContacts{ - [Environment.getCurrent.phoneDirectoryManager forceUpdate]; + Environment *env = [Environment getCurrent]; + PhoneNumberDirectoryFilterManager *manager = [env phoneDirectoryManager]; + [manager forceUpdate]; } - (void)contactRefreshFailed{ diff --git a/Signal/src/view controllers/xibs/DialerViewController.xib b/Signal/src/view controllers/xibs/DialerViewController.xib index 5d8223569..eb002fe1f 100755 --- a/Signal/src/view controllers/xibs/DialerViewController.xib +++ b/Signal/src/view controllers/xibs/DialerViewController.xib @@ -1,5 +1,5 @@ - + @@ -82,7 +82,7 @@ -