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 the issue of input disappearing after asking for permission of using camera or photo library

This commit is contained in:
Ryan ZHAO 2020-02-26 14:11:33 +11:00
parent c26457cf74
commit f3c649e351
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3081,7 +3081,11 @@ typedef enum : NSUInteger {
- (void)sendMediaNavDidCancel:(SendMediaNavigationController *)sendMediaNavigationController
{
[self dismissViewControllerAnimated:YES completion:nil];
[self dismissViewControllerAnimated:YES completion:^{
if (!self.isFirstResponder) {
[self becomeFirstResponder];
}
}];
}
- (void)sendMediaNav:(SendMediaNavigationController *)sendMediaNavigationController
@ -3096,15 +3100,16 @@ typedef enum : NSUInteger {
// the new message scroll into view.
[self scrollToBottomAnimated:NO];
[self dismissViewControllerAnimated:YES
completion:^{
// OWSAssertDebug(self.isFirstResponder);
if (@available(iOS 10, *)) {
// do nothing
} else {
[self reloadInputViews];
}
}];
[self dismissViewControllerAnimated:YES completion:^{
if (!self.isFirstResponder) {
[self becomeFirstResponder];
}
if (@available(iOS 10, *)) {
// do nothing
} else {
[self reloadInputViews];
}
}];
}
- (nullable NSString *)sendMediaNavInitialMessageText:(SendMediaNavigationController *)sendMediaNavigationController