mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-08-01 07:57:01 +00:00
Merge pull request #33 from Soph/develop
fixed warning "dismissModalViewControllerAnimated is deprecated"
This commit is contained in:
commit
abfc1ed3a5
@ -222,7 +222,7 @@
|
|||||||
if (self.delegate && [self.delegate respondsToSelector:@selector(feedbackComposeViewControllerDidFinish:)]) {
|
if (self.delegate && [self.delegate respondsToSelector:@selector(feedbackComposeViewControllerDidFinish:)]) {
|
||||||
[self.delegate feedbackComposeViewControllerDidFinish:self];
|
[self.delegate feedbackComposeViewControllerDidFinish:self];
|
||||||
} else {
|
} else {
|
||||||
[self dismissModalViewControllerAnimated:YES];
|
[self dismissViewControllerAnimated:YES completion:nil];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -263,21 +263,21 @@
|
|||||||
if ([self.navigationController respondsToSelector:@selector(dismissViewControllerAnimated:completion:)]) {
|
if ([self.navigationController respondsToSelector:@selector(dismissViewControllerAnimated:completion:)]) {
|
||||||
[self.navigationController dismissViewControllerAnimated:YES
|
[self.navigationController dismissViewControllerAnimated:YES
|
||||||
completion:^(void) {
|
completion:^(void) {
|
||||||
[self dismissModalViewControllerAnimated:YES];
|
[self dismissViewControllerAnimated:YES completion:nil];
|
||||||
}];
|
}];
|
||||||
} else {
|
} else {
|
||||||
[self dismissModalViewControllerAnimated:YES];
|
[self dismissViewControllerAnimated:YES completion:nil];
|
||||||
[self performSelector:@selector(dismissAction:) withObject:nil afterDelay:0.4];
|
[self performSelector:@selector(dismissAction:) withObject:nil afterDelay:0.4];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
[self.navigationController dismissModalViewControllerAnimated:YES];
|
[self.navigationController dismissViewControllerAnimated:YES completion:nil];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)userDataUpdateFinished {
|
- (void)userDataUpdateFinished {
|
||||||
[self.manager saveMessages];
|
[self.manager saveMessages];
|
||||||
|
|
||||||
[self.navigationController dismissModalViewControllerAnimated:YES];
|
[self.navigationController dismissViewControllerAnimated:YES completion:nil];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
// If there is no presenting view controller just remove view
|
// If there is no presenting view controller just remove view
|
||||||
if (presentingViewController && self.modalAnimated) {
|
if (presentingViewController && self.modalAnimated) {
|
||||||
[presentingViewController dismissModalViewControllerAnimated:YES];
|
[presentingViewController dismissViewControllerAnimated:YES completion:nil];
|
||||||
} else {
|
} else {
|
||||||
[self.navigationController.view removeFromSuperview];
|
[self.navigationController.view removeFromSuperview];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user