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

Fix: input toolbar disappears when tapping media while edit menu is 

present

// FREEBIE
This commit is contained in:
Michael Kirk 2018-06-01 11:09:16 -04:00
parent e6c659d0ff
commit ae1d82be84
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -2075,6 +2075,12 @@ typedef enum : NSUInteger {
[self dismissKeyBoard];
// In case we were presenting edit menu, we need to become first responder before presenting another VC
// else UIKit won't restore first responder status to us when the presented VC is dismissed.
if (!self.isFirstResponder) {
[self becomeFirstResponder];
}
if (![viewItem.interaction isKindOfClass:[TSMessage class]]) {
OWSFail(@"Unexpected viewItem.interaction");
return;
@ -2098,6 +2104,11 @@ typedef enum : NSUInteger {
OWSAssert(attachmentStream);
[self dismissKeyBoard];
// In case we were presenting edit menu, we need to become first responder before presenting another VC
// else UIKit won't restore first responder status to us when the presented VC is dismissed.
if (!self.isFirstResponder) {
[self becomeFirstResponder];
}
if (![viewItem.interaction isKindOfClass:[TSMessage class]]) {
OWSFail(@"Unexpected viewItem.interaction");