github/apache-cordova-plugin-inappbrowser
github/apache-cordova-plugin-inappbrowser
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #272 from jcesarmobile/CB-12922

Browse Source 
CB-12922 (ios): fix In-app browser does not cede control
This commit is contained in:
jcesarmobile 2018-07-12 00:30:32 +02:00 committed by GitHub
commit 9cc7f69625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ios/CDVInAppBrowser.h
View File

@ -30,6 +30,7 @@
@class CDVInAppBrowserViewController; @class CDVInAppBrowserViewController;
@interface CDVInAppBrowser : CDVPlugin { @interface CDVInAppBrowser : CDVPlugin {
UIWindow * tmpWindow;
} }
@property (nonatomic, retain) CDVInAppBrowserViewController* inAppBrowserViewController; @property (nonatomic, retain) CDVInAppBrowserViewController* inAppBrowserViewController;

16
src/ios/CDVInAppBrowser.m
View File

@ -239,8 +239,10 @@
// Run later to avoid the "took a long time" log message. // Run later to avoid the "took a long time" log message.
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
if (weakSelf.inAppBrowserViewController != nil) { if (weakSelf.inAppBrowserViewController != nil) {
if (!tmpWindow) {
CGRect frame = [[UIScreen mainScreen] bounds]; CGRect frame = [[UIScreen mainScreen] bounds];
UIWindow *tmpWindow = [[UIWindow alloc] initWithFrame:frame]; tmpWindow = [[UIWindow alloc] initWithFrame:frame];
}
UIViewController *tmpController = [[UIViewController alloc] init]; UIViewController *tmpController = [[UIViewController alloc] init];
[tmpWindow setRootViewController:tmpController]; [tmpWindow setRootViewController:tmpController];
[tmpWindow setWindowLevel:UIWindowLevelNormal]; [tmpWindow setWindowLevel:UIWindowLevelNormal];
@ -270,7 +272,9 @@
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
if (self.inAppBrowserViewController != nil) { if (self.inAppBrowserViewController != nil) {
_previousStatusBarStyle = -1; _previousStatusBarStyle = -1;
[self.inAppBrowserViewController.presentingViewController dismissViewControllerAnimated:YES completion:nil]; [self.inAppBrowserViewController.presentingViewController dismissViewControllerAnimated:YES completion:^{
[[[[UIApplication sharedApplication] delegate] window] makeKeyAndVisible];
}];
} }
}); });
} }
@ -835,9 +839,13 @@
// Run later to avoid the "took a long time" log message. // Run later to avoid the "took a long time" log message.
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
if ([weakSelf respondsToSelector:@selector(presentingViewController)]) { if ([weakSelf respondsToSelector:@selector(presentingViewController)]) {
[[weakSelf presentingViewController] dismissViewControllerAnimated:YES completion:nil]; [[weakSelf presentingViewController] dismissViewControllerAnimated:YES completion:^{
[[[[UIApplication sharedApplication] delegate] window] makeKeyAndVisible];
}];
} else { } else {
[[weakSelf parentViewController] dismissViewControllerAnimated:YES completion:nil]; [[weakSelf parentViewController] dismissViewControllerAnimated:YES completion:^{
[[[[UIApplication sharedApplication] delegate] window] makeKeyAndVisible];
}];
} }
}); });
} }