oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/show-message-actions-on-call'

Browse source
This commit is contained in:
Michael Kirk 2018-08-23 15:55:18 -06:00
parent 495ed56676 bc2ba63c21
commit ae44b316aa
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
SignalMessaging/utils/OWSWindowManager.m
View file

@ -406,33 +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 ensureMessageActionsWindowHidden];
[self ensureScreenBlockWindowHidden];
} 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];
}
}
}