oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename for clarity 

// FREEBIE
This commit is contained in:
Michael Kirk 2018-05-16 10:23:23 -04:00 committed by Matthew Chen
parent 91cd1af3f9
commit 2258e18d34
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Signal/src/util/OWSWindowManager.m
View File

@ -71,7 +71,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
@property (nonatomic) BOOL isScreenBlockActive;
@property (nonatomic) BOOL isCallViewActive;
@property (nonatomic) BOOL shouldShowCallView;
@property (nonatomic, nullable) UIViewController *callViewController;
@ -191,7 +191,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
// Attach callViewController to window.
[self.callNavigationController popToRootViewControllerAnimated:NO];
[self.callNavigationController pushViewController:callViewController animated:NO];
self.isCallViewActive = YES;
self.shouldShowCallView = YES;
[self ensureWindowState];
}
@ -210,7 +210,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
// Dettach callViewController from window.
[self.callNavigationController popToRootViewControllerAnimated:NO];
self.callViewController = nil;
self.isCallViewActive = NO;
self.shouldShowCallView = NO;
[self ensureWindowState];
}
@ -219,9 +219,9 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
{
OWSAssertIsOnMainThread();
OWSAssert(self.callViewController);
OWSAssert(self.isCallViewActive);
OWSAssert(self.shouldShowCallView);
self.isCallViewActive = NO;
self.shouldShowCallView = NO;
[self ensureWindowState];
}
@ -230,9 +230,9 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
{
OWSAssertIsOnMainThread();
OWSAssert(self.callViewController);
OWSAssert(!self.isCallViewActive);
OWSAssert(!self.shouldShowCallView);
self.isCallViewActive = YES;
self.shouldShowCallView = YES;
[self ensureWindowState];
}
@ -266,7 +266,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
[self ensureReturnToCallWindowHidden];
[self ensureCallViewWindowHidden];
[self ensureScreenBlockWindowShown];
} else if (self.callViewController && self.isCallViewActive) {
} else if (self.callViewController && self.shouldShowCallView) {
// Show Call View.
[self ensureRootWindowHidden];