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

DRY refactor

This commit is contained in:
Michael Kirk 2018-08-22 13:10:30 -06:00
parent 37738c24c5
commit bc2ba63c21
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
SignalMessaging/utils/OWSWindowManager.m
View File

@ -406,37 +406,31 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
[self ensureCallViewWindowShown];
[self ensureMessageActionsWindowHidden];
[self ensureScreenBlockWindowHidden];
} else if (self.callViewController) {
// Show Root Window + "Return to Call".
[self ensureRootWindowShown];
[self ensureReturnToCallWindowShown];
[self ensureCallViewWindowHidden];
[self ensureScreenBlockWindowHidden];
if (self.menuActionsViewController) {
[self ensureMessageActionsWindowShown];
} else {
[self ensureMessageActionsWindowHidden];
}
} else if (self.menuActionsViewController) {
// Show Message Actions
[self ensureRootWindowShown];
[self ensureReturnToCallWindowHidden];
[self ensureCallViewWindowHidden];
[self ensureMessageActionsWindowShown];
[self ensureScreenBlockWindowHidden];
// Don't hide rootWindow so as not to dismiss keyboard.
OWSAssert(!self.rootWindow.isHidden);
} else {
// Show Root Window
[self ensureRootWindowShown];
[self ensureReturnToCallWindowHidden];
[self ensureCallViewWindowHidden];
[self ensureMessageActionsWindowHidden];
[self ensureScreenBlockWindowHidden];
if (self.callViewController) {
// Add "Return to Call" banner
[self ensureReturnToCallWindowShown];
} else {
[self ensureReturnToCallWindowHidden];
}
if (self.menuActionsViewController) {
// Add "Message Actions" action sheet
[self ensureMessageActionsWindowShown];
// Don't hide rootWindow so as not to dismiss keyboard.
OWSAssert(!self.rootWindow.isHidden);
} else {
[self ensureMessageActionsWindowHidden];
}
}
}