Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix the https://github.com/matrix-org/matrix-ios-sdk/issues/4 fix

Browse source 
- SYIOS-52 - app wrashses when attempting to send a message on iPad mini (IOS7)
This commit is contained in:
ylecollen 2015-01-12 13:31:54 +01:00
parent 2f50e2da36
commit 7c1998aa65
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
matrixConsole/ViewController/RoomViewController.m
View file

@ -1149,6 +1149,16 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
// the duration is ignored but it is better to define it
double animationDuration = [[[notif userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
// remove pending observers to avoid duplicates
// onKeyboardWillShow could be called several times bebore onKeyboardWillHide
// because the keyboard height is updated (swicth to a chinese keyboard for example)
// fixes https://github.com/matrix-org/matrix-ios-sdk/issues/4
if (isKeyboardObserver) {
[inputAccessoryView.superview removeObserver:self forKeyPath:@"frame"];
[inputAccessoryView.superview removeObserver:self forKeyPath:@"center"];
isKeyboardObserver = NO;
}
[UIView animateWithDuration:animationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState | (animationCurve << 16) animations:^{
// Move up control view
@ -1165,16 +1175,11 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
[self.view layoutIfNeeded];
} completion:^(BOOL finished) {
// be warned when the keyboard frame is updated
[inputAccessoryView.superview addObserver:self forKeyPath:@"frame" options:0 context:nil];
[inputAccessoryView.superview addObserver:self forKeyPath:@"center" options:0 context:nil];
isKeyboardObserver = YES;
}];
// be warned when the keyboard frame is updated
// we don't this put this in completion otherwise we may race and leak observers if we
// remove the observer (e.g. in onKeyboardWillHide) before the animation has completed.
// fixes https://github.com/matrix-org/matrix-ios-sdk/issues/4
[inputAccessoryView.superview addObserver:self forKeyPath:@"frame" options:0 context:nil];
[inputAccessoryView.superview addObserver:self forKeyPath:@"center" options:0 context:nil];
isKeyboardObserver = YES;
}
- (void)onKeyboardWillHide:(NSNotification *)notif {