2018-09-03 13:12:15 +01:00
|
|
|
/*
|
|
|
|
Licensed to the Apache Software Foundation (ASF) under one
|
|
|
|
or more contributor license agreements. See the NOTICE file
|
|
|
|
distributed with this work for additional information
|
|
|
|
regarding copyright ownership. The ASF licenses this file
|
|
|
|
to you under the Apache License, Version 2.0 (the
|
|
|
|
"License"); you may not use this file except in compliance
|
|
|
|
with the License. You may obtain a copy of the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing,
|
|
|
|
software distributed under the License is distributed on an
|
|
|
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
|
|
KIND, either express or implied. See the License for the
|
|
|
|
specific language governing permissions and limitations
|
|
|
|
under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#import "CDVUIInAppBrowser.h"
|
|
|
|
#import <Cordova/CDVPluginResult.h>
|
|
|
|
#import <Cordova/CDVUserAgentUtil.h>
|
|
|
|
|
|
|
|
#define kInAppBrowserTargetSelf @"_self"
|
|
|
|
#define kInAppBrowserTargetSystem @"_system"
|
|
|
|
#define kInAppBrowserTargetBlank @"_blank"
|
|
|
|
|
|
|
|
#define kInAppBrowserToolbarBarPositionBottom @"bottom"
|
|
|
|
#define kInAppBrowserToolbarBarPositionTop @"top"
|
|
|
|
|
|
|
|
#define TOOLBAR_HEIGHT 44.0
|
|
|
|
#define STATUSBAR_HEIGHT 20.0
|
|
|
|
#define LOCATIONBAR_HEIGHT 21.0
|
|
|
|
#define FOOTER_HEIGHT ((TOOLBAR_HEIGHT) + (LOCATIONBAR_HEIGHT))
|
|
|
|
|
|
|
|
#pragma mark CDVUIInAppBrowser
|
|
|
|
|
|
|
|
@interface CDVUIInAppBrowser () {
|
|
|
|
NSInteger _previousStatusBarStyle;
|
|
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation CDVUIInAppBrowser
|
|
|
|
|
|
|
|
static CDVUIInAppBrowser* instance = nil;
|
|
|
|
|
|
|
|
+ (id) getInstance{
|
|
|
|
return instance;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)pluginInitialize
|
|
|
|
{
|
|
|
|
instance = self;
|
|
|
|
_previousStatusBarStyle = -1;
|
|
|
|
_callbackIdPattern = nil;
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
_beforeload = @"";
|
2018-10-09 11:15:23 +01:00
|
|
|
_waitForBeforeload = NO;
|
2018-09-03 13:12:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
- (id)settingForKey:(NSString*)key
|
|
|
|
{
|
|
|
|
return [self.commandDelegate.settings objectForKey:[key lowercaseString]];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)onReset
|
|
|
|
{
|
|
|
|
[self close:nil];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)close:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
if (self.inAppBrowserViewController == nil) {
|
|
|
|
NSLog(@"IAB.close() called but it was already closed.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Things are cleaned up in browserExit.
|
|
|
|
[self.inAppBrowserViewController close];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL) isSystemUrl:(NSURL*)url
|
|
|
|
{
|
|
|
|
if ([[url host] isEqualToString:@"itunes.apple.com"]) {
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)open:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
CDVPluginResult* pluginResult;
|
|
|
|
|
|
|
|
NSString* url = [command argumentAtIndex:0];
|
|
|
|
NSString* target = [command argumentAtIndex:1 withDefault:kInAppBrowserTargetSelf];
|
|
|
|
NSString* options = [command argumentAtIndex:2 withDefault:@"" andClass:[NSString class]];
|
|
|
|
|
|
|
|
self.callbackId = command.callbackId;
|
|
|
|
|
|
|
|
if (url != nil) {
|
|
|
|
#ifdef __CORDOVA_4_0_0
|
|
|
|
NSURL* baseUrl = [self.webViewEngine URL];
|
|
|
|
#else
|
|
|
|
NSURL* baseUrl = [self.webView.request URL];
|
|
|
|
#endif
|
|
|
|
NSURL* absoluteUrl = [[NSURL URLWithString:url relativeToURL:baseUrl] absoluteURL];
|
|
|
|
|
|
|
|
if ([self isSystemUrl:absoluteUrl]) {
|
|
|
|
target = kInAppBrowserTargetSystem;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ([target isEqualToString:kInAppBrowserTargetSelf]) {
|
|
|
|
[self openInCordovaWebView:absoluteUrl withOptions:options];
|
|
|
|
} else if ([target isEqualToString:kInAppBrowserTargetSystem]) {
|
|
|
|
[self openInSystem:absoluteUrl];
|
|
|
|
} else { // _blank or anything else
|
|
|
|
[self openInInAppBrowser:absoluteUrl withOptions:options];
|
|
|
|
}
|
|
|
|
|
|
|
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
|
|
|
|
} else {
|
|
|
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"incorrect number of arguments"];
|
|
|
|
}
|
|
|
|
|
|
|
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)openInInAppBrowser:(NSURL*)url withOptions:(NSString*)options
|
|
|
|
{
|
|
|
|
CDVInAppBrowserOptions* browserOptions = [CDVInAppBrowserOptions parseOptions:options];
|
|
|
|
|
|
|
|
if (browserOptions.clearcache) {
|
|
|
|
NSHTTPCookie *cookie;
|
|
|
|
NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
|
|
|
|
for (cookie in [storage cookies])
|
|
|
|
{
|
|
|
|
if (![cookie.domain isEqual: @".^filecookies^"]) {
|
|
|
|
[storage deleteCookie:cookie];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (browserOptions.clearsessioncache) {
|
|
|
|
NSHTTPCookie *cookie;
|
|
|
|
NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
|
|
|
|
for (cookie in [storage cookies])
|
|
|
|
{
|
|
|
|
if (![cookie.domain isEqual: @".^filecookies^"] && cookie.isSessionOnly) {
|
|
|
|
[storage deleteCookie:cookie];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self.inAppBrowserViewController == nil) {
|
|
|
|
NSString* userAgent = [CDVUserAgentUtil originalUserAgent];
|
|
|
|
NSString* overrideUserAgent = [self settingForKey:@"OverrideUserAgent"];
|
|
|
|
NSString* appendUserAgent = [self settingForKey:@"AppendUserAgent"];
|
|
|
|
if(overrideUserAgent){
|
|
|
|
userAgent = overrideUserAgent;
|
|
|
|
}
|
|
|
|
if(appendUserAgent){
|
|
|
|
userAgent = [userAgent stringByAppendingString: appendUserAgent];
|
|
|
|
}
|
|
|
|
self.inAppBrowserViewController = [[CDVUIInAppBrowserViewController alloc] initWithUserAgent:userAgent prevUserAgent:[self.commandDelegate userAgent] browserOptions: browserOptions];
|
|
|
|
self.inAppBrowserViewController.navigationDelegate = self;
|
|
|
|
|
|
|
|
if ([self.viewController conformsToProtocol:@protocol(CDVScreenOrientationDelegate)]) {
|
|
|
|
self.inAppBrowserViewController.orientationDelegate = (UIViewController <CDVScreenOrientationDelegate>*)self.viewController;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
[self.inAppBrowserViewController showLocationBar:browserOptions.location];
|
|
|
|
[self.inAppBrowserViewController showToolBar:browserOptions.toolbar :browserOptions.toolbarposition];
|
|
|
|
if (browserOptions.closebuttoncaption != nil || browserOptions.closebuttoncolor != nil) {
|
2019-02-28 11:43:34 +00:00
|
|
|
int closeButtonIndex = browserOptions.lefttoright ? (browserOptions.hidenavigationbuttons ? 1 : 4) : 0;
|
|
|
|
[self.inAppBrowserViewController setCloseButtonTitle:browserOptions.closebuttoncaption :browserOptions.closebuttoncolor :closeButtonIndex];
|
2018-09-03 13:12:15 +01:00
|
|
|
}
|
|
|
|
// Set Presentation Style
|
|
|
|
UIModalPresentationStyle presentationStyle = UIModalPresentationFullScreen; // default
|
|
|
|
if (browserOptions.presentationstyle != nil) {
|
|
|
|
if ([[browserOptions.presentationstyle lowercaseString] isEqualToString:@"pagesheet"]) {
|
|
|
|
presentationStyle = UIModalPresentationPageSheet;
|
|
|
|
} else if ([[browserOptions.presentationstyle lowercaseString] isEqualToString:@"formsheet"]) {
|
|
|
|
presentationStyle = UIModalPresentationFormSheet;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self.inAppBrowserViewController.modalPresentationStyle = presentationStyle;
|
|
|
|
|
|
|
|
// Set Transition Style
|
|
|
|
UIModalTransitionStyle transitionStyle = UIModalTransitionStyleCoverVertical; // default
|
|
|
|
if (browserOptions.transitionstyle != nil) {
|
|
|
|
if ([[browserOptions.transitionstyle lowercaseString] isEqualToString:@"fliphorizontal"]) {
|
|
|
|
transitionStyle = UIModalTransitionStyleFlipHorizontal;
|
|
|
|
} else if ([[browserOptions.transitionstyle lowercaseString] isEqualToString:@"crossdissolve"]) {
|
|
|
|
transitionStyle = UIModalTransitionStyleCrossDissolve;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self.inAppBrowserViewController.modalTransitionStyle = transitionStyle;
|
|
|
|
|
|
|
|
// prevent webView from bouncing
|
|
|
|
if (browserOptions.disallowoverscroll) {
|
|
|
|
if ([self.inAppBrowserViewController.webView respondsToSelector:@selector(scrollView)]) {
|
|
|
|
((UIScrollView*)[self.inAppBrowserViewController.webView scrollView]).bounces = NO;
|
|
|
|
} else {
|
|
|
|
for (id subview in self.inAppBrowserViewController.webView.subviews) {
|
|
|
|
if ([[subview class] isSubclassOfClass:[UIScrollView class]]) {
|
|
|
|
((UIScrollView*)subview).bounces = NO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// UIWebView options
|
|
|
|
self.inAppBrowserViewController.webView.scalesPageToFit = browserOptions.enableviewportscale;
|
|
|
|
self.inAppBrowserViewController.webView.mediaPlaybackRequiresUserAction = browserOptions.mediaplaybackrequiresuseraction;
|
|
|
|
self.inAppBrowserViewController.webView.allowsInlineMediaPlayback = browserOptions.allowinlinemediaplayback;
|
|
|
|
if (IsAtLeastiOSVersion(@"6.0")) {
|
|
|
|
self.inAppBrowserViewController.webView.keyboardDisplayRequiresUserAction = browserOptions.keyboarddisplayrequiresuseraction;
|
|
|
|
self.inAppBrowserViewController.webView.suppressesIncrementalRendering = browserOptions.suppressesincrementalrendering;
|
|
|
|
}
|
|
|
|
|
2018-10-09 11:15:23 +01:00
|
|
|
// use of beforeload event
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
if([browserOptions.beforeload isKindOfClass:[NSString class]]){
|
|
|
|
_beforeload = browserOptions.beforeload;
|
|
|
|
}else{
|
|
|
|
_beforeload = @"yes";
|
|
|
|
}
|
|
|
|
_waitForBeforeload = ![_beforeload isEqualToString:@""];
|
2018-10-09 11:15:23 +01:00
|
|
|
|
2018-09-03 13:12:15 +01:00
|
|
|
[self.inAppBrowserViewController navigateTo:url];
|
|
|
|
if (!browserOptions.hidden) {
|
|
|
|
[self show:nil];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)show:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
if (self.inAppBrowserViewController == nil) {
|
|
|
|
NSLog(@"Tried to show IAB after it was closed.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (_previousStatusBarStyle != -1) {
|
|
|
|
NSLog(@"Tried to show IAB while already shown");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
_previousStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
|
|
|
|
|
|
|
|
__block CDVInAppBrowserNavigationController* nav = [[CDVInAppBrowserNavigationController alloc]
|
|
|
|
initWithRootViewController:self.inAppBrowserViewController];
|
|
|
|
nav.orientationDelegate = self.inAppBrowserViewController;
|
|
|
|
nav.navigationBarHidden = YES;
|
|
|
|
nav.modalPresentationStyle = self.inAppBrowserViewController.modalPresentationStyle;
|
|
|
|
|
|
|
|
__weak CDVUIInAppBrowser* weakSelf = self;
|
|
|
|
|
|
|
|
// Run later to avoid the "took a long time" log message.
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
|
if (weakSelf.inAppBrowserViewController != nil) {
|
|
|
|
if (!tmpWindow) {
|
|
|
|
CGRect frame = [[UIScreen mainScreen] bounds];
|
|
|
|
tmpWindow = [[UIWindow alloc] initWithFrame:frame];
|
|
|
|
}
|
|
|
|
UIViewController *tmpController = [[UIViewController alloc] init];
|
|
|
|
[tmpWindow setRootViewController:tmpController];
|
|
|
|
|
|
|
|
[tmpWindow makeKeyAndVisible];
|
|
|
|
[tmpController presentViewController:nav animated:YES completion:nil];
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)hide:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
if (self.inAppBrowserViewController == nil) {
|
|
|
|
NSLog(@"Tried to hide IAB after it was closed.");
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
if (_previousStatusBarStyle == -1) {
|
|
|
|
NSLog(@"Tried to hide IAB while already hidden");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
_previousStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
|
|
|
|
|
|
|
|
// Run later to avoid the "took a long time" log message.
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
|
if (self.inAppBrowserViewController != nil) {
|
|
|
|
_previousStatusBarStyle = -1;
|
|
|
|
[self.inAppBrowserViewController.presentingViewController dismissViewControllerAnimated:YES completion:^{
|
|
|
|
[[[[UIApplication sharedApplication] delegate] window] makeKeyAndVisible];
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)openInCordovaWebView:(NSURL*)url withOptions:(NSString*)options
|
|
|
|
{
|
|
|
|
NSURLRequest* request = [NSURLRequest requestWithURL:url];
|
|
|
|
|
|
|
|
#ifdef __CORDOVA_4_0_0
|
|
|
|
// the webview engine itself will filter for this according to <allow-navigation> policy
|
|
|
|
// in config.xml for cordova-ios-4.0
|
|
|
|
[self.webViewEngine loadRequest:request];
|
|
|
|
#else
|
|
|
|
if ([self.commandDelegate URLIsWhitelisted:url]) {
|
|
|
|
[self.webView loadRequest:request];
|
|
|
|
} else { // this assumes the InAppBrowser can be excepted from the white-list
|
|
|
|
[self openInInAppBrowser:url withOptions:options];
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)openInSystem:(NSURL*)url
|
|
|
|
{
|
|
|
|
if ([[UIApplication sharedApplication] openURL:url] == NO) {
|
|
|
|
[[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginHandleOpenURLNotification object:url]];
|
|
|
|
[[UIApplication sharedApplication] openURL:url];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-09 11:15:23 +01:00
|
|
|
- (void)loadAfterBeforeload:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
NSString* urlStr = [command argumentAtIndex:0];
|
|
|
|
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
if ([_beforeload isEqualToString:@""]) {
|
2018-10-09 11:15:23 +01:00
|
|
|
NSLog(@"unexpected loadAfterBeforeload called without feature beforeload=yes");
|
|
|
|
}
|
|
|
|
if (self.inAppBrowserViewController == nil) {
|
|
|
|
NSLog(@"Tried to invoke loadAfterBeforeload on IAB after it was closed.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (urlStr == nil) {
|
|
|
|
NSLog(@"loadAfterBeforeload called with nil argument, ignoring.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
NSURL* url = [NSURL URLWithString:urlStr];
|
|
|
|
_waitForBeforeload = NO;
|
|
|
|
[self.inAppBrowserViewController navigateTo:url];
|
|
|
|
}
|
|
|
|
|
2018-12-13 16:21:45 +00:00
|
|
|
-(void)createIframeBridge
|
|
|
|
{
|
|
|
|
// Create an iframe bridge in the new document to communicate with the CDVThemeableBrowserViewController
|
|
|
|
NSString* jsIframeBridge = @"var e = _cdvIframeBridge=d.getElementById('_cdvIframeBridge'); if(!_cdvIframeBridge) {e = _cdvIframeBridge = d.createElement('iframe'); e.id='_cdvIframeBridge'; e.style.display='none'; d.body.appendChild(e);}";
|
|
|
|
// Add the postMessage API
|
|
|
|
NSString* jspostMessageApi = @"window.webkit={messageHandlers:{cordova_iab:{postMessage:function(message){_cdvIframeBridge.src='gap-iab://message/'+encodeURIComponent(message);}}}}";
|
|
|
|
// Inject the JS to the webview
|
|
|
|
[self.inAppBrowserViewController.webView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"(function(d){%@%@})(document)", jsIframeBridge, jspostMessageApi]];
|
|
|
|
}
|
|
|
|
|
2018-09-03 13:12:15 +01:00
|
|
|
// This is a helper method for the inject{Script|Style}{Code|File} API calls, which
|
|
|
|
// provides a consistent method for injecting JavaScript code into the document.
|
|
|
|
//
|
|
|
|
// If a wrapper string is supplied, then the source string will be JSON-encoded (adding
|
|
|
|
// quotes) and wrapped using string formatting. (The wrapper string should have a single
|
|
|
|
// '%@' marker).
|
|
|
|
//
|
|
|
|
// If no wrapper is supplied, then the source string is executed directly.
|
|
|
|
|
|
|
|
- (void)injectDeferredObject:(NSString*)source withWrapper:(NSString*)jsWrapper
|
|
|
|
{
|
|
|
|
if (jsWrapper != nil) {
|
|
|
|
NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];
|
|
|
|
NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
|
|
|
|
if (sourceArrayString) {
|
|
|
|
NSString* sourceString = [sourceArrayString substringWithRange:NSMakeRange(1, [sourceArrayString length] - 2)];
|
|
|
|
NSString* jsToInject = [NSString stringWithFormat:jsWrapper, sourceString];
|
|
|
|
[self.inAppBrowserViewController.webView stringByEvaluatingJavaScriptFromString:jsToInject];
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
[self.inAppBrowserViewController.webView stringByEvaluatingJavaScriptFromString:source];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)injectScriptCode:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
NSString* jsWrapper = nil;
|
|
|
|
|
|
|
|
if ((command.callbackId != nil) && ![command.callbackId isEqualToString:@"INVALID"]) {
|
|
|
|
jsWrapper = [NSString stringWithFormat:@"_cdvIframeBridge.src='gap-iab://%@/'+encodeURIComponent(JSON.stringify([eval(%%@)]));", command.callbackId];
|
|
|
|
}
|
|
|
|
[self injectDeferredObject:[command argumentAtIndex:0] withWrapper:jsWrapper];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)injectScriptFile:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
NSString* jsWrapper;
|
|
|
|
|
|
|
|
if ((command.callbackId != nil) && ![command.callbackId isEqualToString:@"INVALID"]) {
|
|
|
|
jsWrapper = [NSString stringWithFormat:@"(function(d) { var c = d.createElement('script'); c.src = %%@; c.onload = function() { _cdvIframeBridge.src='gap-iab://%@'; }; d.body.appendChild(c); })(document)", command.callbackId];
|
|
|
|
} else {
|
|
|
|
jsWrapper = @"(function(d) { var c = d.createElement('script'); c.src = %@; d.body.appendChild(c); })(document)";
|
|
|
|
}
|
|
|
|
[self injectDeferredObject:[command argumentAtIndex:0] withWrapper:jsWrapper];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)injectStyleCode:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
NSString* jsWrapper;
|
|
|
|
|
|
|
|
if ((command.callbackId != nil) && ![command.callbackId isEqualToString:@"INVALID"]) {
|
|
|
|
jsWrapper = [NSString stringWithFormat:@"(function(d) { var c = d.createElement('style'); c.innerHTML = %%@; c.onload = function() { _cdvIframeBridge.src='gap-iab://%@'; }; d.body.appendChild(c); })(document)", command.callbackId];
|
|
|
|
} else {
|
|
|
|
jsWrapper = @"(function(d) { var c = d.createElement('style'); c.innerHTML = %@; d.body.appendChild(c); })(document)";
|
|
|
|
}
|
|
|
|
[self injectDeferredObject:[command argumentAtIndex:0] withWrapper:jsWrapper];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)injectStyleFile:(CDVInvokedUrlCommand*)command
|
|
|
|
{
|
|
|
|
NSString* jsWrapper;
|
|
|
|
|
|
|
|
if ((command.callbackId != nil) && ![command.callbackId isEqualToString:@"INVALID"]) {
|
|
|
|
jsWrapper = [NSString stringWithFormat:@"(function(d) { var c = d.createElement('link'); c.rel='stylesheet'; c.type='text/css'; c.href = %%@; c.onload = function() { _cdvIframeBridge.src='gap-iab://%@'; }; d.body.appendChild(c); })(document)", command.callbackId];
|
|
|
|
} else {
|
|
|
|
jsWrapper = @"(function(d) { var c = d.createElement('link'); c.rel='stylesheet', c.type='text/css'; c.href = %@; d.body.appendChild(c); })(document)";
|
|
|
|
}
|
|
|
|
[self injectDeferredObject:[command argumentAtIndex:0] withWrapper:jsWrapper];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL)isValidCallbackId:(NSString *)callbackId
|
|
|
|
{
|
|
|
|
NSError *err = nil;
|
|
|
|
// Initialize on first use
|
|
|
|
if (self.callbackIdPattern == nil) {
|
|
|
|
self.callbackIdPattern = [NSRegularExpression regularExpressionWithPattern:@"^InAppBrowser[0-9]{1,10}$" options:0 error:&err];
|
|
|
|
if (err != nil) {
|
|
|
|
// Couldn't initialize Regex; No is safer than Yes.
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ([self.callbackIdPattern firstMatchInString:callbackId options:0 range:NSMakeRange(0, [callbackId length])]) {
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The iframe bridge provided for the InAppBrowser is capable of executing any oustanding callback belonging
|
|
|
|
* to the InAppBrowser plugin. Care has been taken that other callbacks cannot be triggered, and that no
|
|
|
|
* other code execution is possible.
|
|
|
|
*
|
|
|
|
* To trigger the bridge, the iframe (or any other resource) should attempt to load a url of the form:
|
|
|
|
*
|
|
|
|
* gap-iab://<callbackId>/<arguments>
|
|
|
|
*
|
|
|
|
* where <callbackId> is the string id of the callback to trigger (something like "InAppBrowser0123456789")
|
|
|
|
*
|
|
|
|
* If present, the path component of the special gap-iab:// url is expected to be a URL-escaped JSON-encoded
|
|
|
|
* value to pass to the callback. [NSURL path] should take care of the URL-unescaping, and a JSON_EXCEPTION
|
|
|
|
* is returned if the JSON is invalid.
|
|
|
|
*/
|
|
|
|
- (BOOL)webView:(UIWebView*)theWebView shouldStartLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType
|
|
|
|
{
|
|
|
|
NSURL* url = request.URL;
|
|
|
|
BOOL isTopLevelNavigation = [request.URL isEqual:[request mainDocumentURL]];
|
2018-10-09 11:15:23 +01:00
|
|
|
BOOL shouldStart = YES;
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
BOOL useBeforeLoad = NO;
|
|
|
|
NSString* httpMethod = request.HTTPMethod;
|
|
|
|
NSString* errorMessage = nil;
|
|
|
|
|
|
|
|
if([_beforeload isEqualToString:@"post"]){
|
|
|
|
//TODO handle POST requests by preserving POST data then remove this condition
|
|
|
|
errorMessage = @"beforeload doesn't yet support POST requests";
|
|
|
|
}
|
|
|
|
else if(isTopLevelNavigation && (
|
|
|
|
[_beforeload isEqualToString:@"yes"]
|
|
|
|
|| ([_beforeload isEqualToString:@"get"] && [httpMethod isEqualToString:@"GET"])
|
|
|
|
// TODO comment in when POST requests are handled
|
|
|
|
// || ([_beforeload isEqualToString:@"post"] && [httpMethod isEqualToString:@"POST"])
|
|
|
|
)){
|
|
|
|
useBeforeLoad = YES;
|
|
|
|
}
|
2018-09-03 13:12:15 +01:00
|
|
|
|
|
|
|
// See if the url uses the 'gap-iab' protocol. If so, the host should be the id of a callback to execute,
|
|
|
|
// and the path, if present, should be a JSON-encoded value to pass to the callback.
|
|
|
|
if ([[url scheme] isEqualToString:@"gap-iab"]) {
|
|
|
|
NSString* scriptCallbackId = [url host];
|
|
|
|
CDVPluginResult* pluginResult = nil;
|
|
|
|
|
|
|
|
if ([self isValidCallbackId:scriptCallbackId]) {
|
|
|
|
NSString* scriptResult = [url path];
|
|
|
|
NSError* __autoreleasing error = nil;
|
|
|
|
|
|
|
|
// The message should be a JSON-encoded array of the result of the script which executed.
|
|
|
|
if ((scriptResult != nil) && ([scriptResult length] > 1)) {
|
|
|
|
scriptResult = [scriptResult substringFromIndex:1];
|
|
|
|
NSData* decodedResult = [NSJSONSerialization JSONObjectWithData:[scriptResult dataUsingEncoding:NSUTF8StringEncoding] options:kNilOptions error:&error];
|
|
|
|
if ((error == nil) && [decodedResult isKindOfClass:[NSArray class]]) {
|
|
|
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:(NSArray*)decodedResult];
|
|
|
|
} else {
|
|
|
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_JSON_EXCEPTION];
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:@[]];
|
|
|
|
}
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:scriptCallbackId];
|
|
|
|
return NO;
|
2018-12-13 16:21:45 +00:00
|
|
|
}else if ([scriptCallbackId isEqualToString:@"message"] && (self.callbackId != nil)) {
|
|
|
|
// Send a message event
|
|
|
|
NSString* scriptResult = [url path];
|
|
|
|
if ((scriptResult != nil) && ([scriptResult length] > 1)) {
|
|
|
|
scriptResult = [scriptResult substringFromIndex:1];
|
|
|
|
NSError* __autoreleasing error = nil;
|
|
|
|
NSData* decodedResult = [NSJSONSerialization JSONObjectWithData:[scriptResult dataUsingEncoding:NSUTF8StringEncoding] options:kNilOptions error:&error];
|
|
|
|
if (error == nil) {
|
|
|
|
NSMutableDictionary* dResult = [NSMutableDictionary new];
|
|
|
|
[dResult setValue:@"message" forKey:@"type"];
|
|
|
|
[dResult setObject:decodedResult forKey:@"data"];
|
|
|
|
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dResult];
|
|
|
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
|
|
|
}
|
|
|
|
}
|
2018-09-03 13:12:15 +01:00
|
|
|
}
|
|
|
|
}
|
2018-10-09 11:15:23 +01:00
|
|
|
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
// When beforeload, on first URL change, initiate JS callback. Only after the beforeload event, continue.
|
|
|
|
if (_waitForBeforeload && useBeforeLoad) {
|
2018-10-09 11:15:23 +01:00
|
|
|
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
|
|
|
|
messageAsDictionary:@{@"type":@"beforeload", @"url":[url absoluteString]}];
|
|
|
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
|
2018-10-09 11:15:23 +01:00
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
|
|
|
return NO;
|
|
|
|
}
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
|
|
|
|
if(errorMessage != nil){
|
|
|
|
NSLog(errorMessage);
|
|
|
|
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
|
|
|
|
messageAsDictionary:@{@"type":@"loaderror", @"url":[url absoluteString], @"code": @"-1", @"message": errorMessage}];
|
|
|
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
|
|
|
}
|
2018-10-09 11:15:23 +01:00
|
|
|
|
2018-09-03 13:12:15 +01:00
|
|
|
//if is an app store link, let the system handle it, otherwise it fails to load it
|
2018-10-09 11:15:23 +01:00
|
|
|
if ([[ url scheme] isEqualToString:@"itms-appss"] || [[ url scheme] isEqualToString:@"itms-apps"]) {
|
2018-09-03 13:12:15 +01:00
|
|
|
[theWebView stopLoading];
|
|
|
|
[self openInSystem:url];
|
2018-10-09 11:15:23 +01:00
|
|
|
shouldStart = NO;
|
2018-09-03 13:12:15 +01:00
|
|
|
}
|
|
|
|
else if ((self.callbackId != nil) && isTopLevelNavigation) {
|
|
|
|
// Send a loadstart event for each top-level navigation (includes redirects).
|
|
|
|
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
|
|
|
|
messageAsDictionary:@{@"type":@"loadstart", @"url":[url absoluteString]}];
|
|
|
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
|
|
|
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
|
|
|
}
|
|
|
|
|
GH-359: Fix beforeload to work with POST requests (#367)
### Platforms affected
iOS and Android
### What does this PR do?
Fixes the behaviour of `beforeload` to resolve the problem with POST requests outlined in #359.
The `beforeload` parameter has been changed from taking only a boolean (`yes` or not defined) to a discrete string with possible values of `get`, `post`, or `yes` which correspond to request types of GET, POST or GET&POST respectively. The `README.md` has been updated to reflect this.
Note that use of `beforeload` to intercept POST requests is currently not supported on Android or iOS, so if `beforeload=yes` is specified and a POST request is detected as the HTTP request method, `beforeload` behaviour will not be applied. If `beforeload=post` is specified, a `loaderror` event will be dispatched which states that POST requests are not yet supported.
#### Notes for Android
The `shouldOverrideUrlLoading()` override method has been updated to support the [new method interface added in API 24 / Android 7][1] which receives the `WebResourceRequest` instead of just the `String url`, enabling the HTTP method of the request to be determined. The [deprecated method interface][2] has also been preserved for API <=23, but in this case the HTTP method cannot be determined so is passed as null.
Also note that due to a [Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=155250), `shouldOverrideUrlLoading()` is currently not called for POST requests. It's possible this may be resolved in a future Chromium version in the Android System Webview (given that this is now self-updating and independent of Android version since Android 5.0) - in prospective anticipation of this, code to handle POST requests has been added to `shouldOverrideUrlLoading()`.
However, it seems more likely that this won't be resolved any time soon given that [a Chromium dev said](https://bugs.chromium.org/p/chromium/issues/detail?id=155250#c39):
> We're looking at implementing a better way to handle request interception in a future OS version. There's no way to just "fix" this, the API doesn't accommodate this usage at all. This will not be something you can use any time soon.
Therefore if we want to go ahead and use `beforeload` to intercept request types other than GET, it's likely we'll instead need to use the `shouldInterceptRequest()` method override. As with `shouldOverrideUrlLoading()`, there are a two variants: the [new method interface][3] added in API 21 / Android 5.0 which which receives the `WebResourceRequest` object and the [deprecated one][4] which receives only `String url`. If we want to determine the HTTP request method, we'll need to use the new implementation. This has been empirically tested and *is* called for POST requests so would allow the possibility to intercept, delay, modify and send the POST request and its data via `beforeload`.
Both `shouldInterceptRequest()` method interfaces have been exposed in the Android implentation for potential future use but they currently do nothing other than return the unadulterated request object.
### What testing has been done on this change?
Manual testing of POST and GET requests on both platforms using a test app container:
https://github.com/dpa99c/cordova-plugin-inappbrowser-test
[1]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[2]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldOverrideUrlLoading(android.webkit.WebView,%20java.lang.String)
[3]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20android.webkit.WebResourceRequest)
[4]: https://developer.android.com/reference/android/webkit/WebViewClient.html#shouldInterceptRequest(android.webkit.WebView,%20java.lang.String)
2018-12-20 19:31:14 +00:00
|
|
|
if (useBeforeLoad) {
|
2018-10-09 11:15:23 +01:00
|
|
|
_waitForBeforeload = YES;
|
|
|
|
}
|
|
|
|
|
|
|
|
return shouldStart;
|
2018-10-09 11:31:26 +01:00
|
|
|
}
|
2018-09-03 13:12:15 +01:00
|
|
|
|
|
|
|
- (void)webViewDidStartLoad:(UIWebView*)theWebView
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)webViewDidFinishLoad:(UIWebView*)theWebView
|
|
|
|
{
|
2018-12-13 16:21:45 +00:00
|
|
|
[self createIframeBridge];
|
2018-09-03 13:12:15 +01:00
|
|
|
if (self.callbackId != nil) {
|
|
|
|
// TODO: It would be more useful to return the URL the page is actually on (e.g. if it's been redirected).
|
|
|
|
NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];
|
|
|
|
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
|
|
|
|
messageAsDictionary:@{@"type":@"loadstop", @"url":url}];
|
|
|
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
|
|
|
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)webView:(UIWebView*)theWebView didFailLoadWithError:(NSError*)error
|
|
|
|
{
|
|
|
|
if (self.callbackId != nil) {
|
|
|
|
NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];
|
|
|
|
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
|
|
|
|
messageAsDictionary:@{@"type":@"loaderror", @"url":url, @"code": [NSNumber numberWithInteger:error.code], @"message": error.localizedDescription}];
|
|
|
|
[pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
|
|
|
|
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)browserExit
|
|
|
|
{
|
|
|
|
if (self.callbackId != nil) {
|
|
|
|
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
|
|
|
|
messageAsDictionary:@{@"type":@"exit"}];
|
|
|
|
[self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
|
|
|
|
self.callbackId = nil;
|
|
|
|
}
|
|
|
|
// Set navigationDelegate to nil to ensure no callbacks are received from it.
|
|
|
|
self.inAppBrowserViewController.navigationDelegate = nil;
|
|
|
|
// Don't recycle the ViewController since it may be consuming a lot of memory.
|
|
|
|
// Also - this is required for the PDF/User-Agent bug work-around.
|
|
|
|
self.inAppBrowserViewController = nil;
|
|
|
|
|
|
|
|
if (IsAtLeastiOSVersion(@"7.0")) {
|
|
|
|
if (_previousStatusBarStyle != -1) {
|
|
|
|
[[UIApplication sharedApplication] setStatusBarStyle:_previousStatusBarStyle];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
_previousStatusBarStyle = -1; // this value was reset before reapplying it. caused statusbar to stay black on ios7
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
#pragma mark CDVUIInAppBrowserViewController
|
|
|
|
|
|
|
|
@implementation CDVUIInAppBrowserViewController
|
|
|
|
|
|
|
|
@synthesize currentURL;
|
|
|
|
|
|
|
|
- (id)initWithUserAgent:(NSString*)userAgent prevUserAgent:(NSString*)prevUserAgent browserOptions: (CDVInAppBrowserOptions*) browserOptions
|
|
|
|
{
|
|
|
|
self = [super init];
|
|
|
|
if (self != nil) {
|
|
|
|
_userAgent = userAgent;
|
|
|
|
_prevUserAgent = prevUserAgent;
|
|
|
|
_browserOptions = browserOptions;
|
|
|
|
#ifdef __CORDOVA_4_0_0
|
|
|
|
_webViewDelegate = [[CDVUIWebViewDelegate alloc] initWithDelegate:self];
|
|
|
|
#else
|
|
|
|
_webViewDelegate = [[CDVWebViewDelegate alloc] initWithDelegate:self];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
[self createViews];
|
|
|
|
}
|
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Prevent crashes on closing windows
|
|
|
|
-(void)dealloc {
|
|
|
|
self.webView.delegate = nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)createViews
|
|
|
|
{
|
|
|
|
// We create the views in code for primarily for ease of upgrades and not requiring an external .xib to be included
|
|
|
|
|
|
|
|
CGRect webViewBounds = self.view.bounds;
|
|
|
|
BOOL toolbarIsAtBottom = ![_browserOptions.toolbarposition isEqualToString:kInAppBrowserToolbarBarPositionTop];
|
|
|
|
webViewBounds.size.height -= _browserOptions.location ? FOOTER_HEIGHT : TOOLBAR_HEIGHT;
|
|
|
|
self.webView = [[UIWebView alloc] initWithFrame:webViewBounds];
|
|
|
|
|
|
|
|
self.webView.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
|
|
|
|
|
|
|
|
[self.view addSubview:self.webView];
|
|
|
|
[self.view sendSubviewToBack:self.webView];
|
|
|
|
|
|
|
|
self.webView.delegate = _webViewDelegate;
|
|
|
|
self.webView.backgroundColor = [UIColor whiteColor];
|
|
|
|
|
|
|
|
self.webView.clearsContextBeforeDrawing = YES;
|
|
|
|
self.webView.clipsToBounds = YES;
|
|
|
|
self.webView.contentMode = UIViewContentModeScaleToFill;
|
|
|
|
self.webView.multipleTouchEnabled = YES;
|
|
|
|
self.webView.opaque = YES;
|
|
|
|
self.webView.scalesPageToFit = NO;
|
|
|
|
self.webView.userInteractionEnabled = YES;
|
|
|
|
|
|
|
|
self.spinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
|
|
|
|
self.spinner.alpha = 1.000;
|
|
|
|
self.spinner.autoresizesSubviews = YES;
|
|
|
|
self.spinner.autoresizingMask = (UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin);
|
|
|
|
self.spinner.clearsContextBeforeDrawing = NO;
|
|
|
|
self.spinner.clipsToBounds = NO;
|
|
|
|
self.spinner.contentMode = UIViewContentModeScaleToFill;
|
|
|
|
self.spinner.frame = CGRectMake(CGRectGetMidX(self.webView.frame), CGRectGetMidY(self.webView.frame), 20.0, 20.0);
|
|
|
|
self.spinner.hidden = NO;
|
|
|
|
self.spinner.hidesWhenStopped = YES;
|
|
|
|
self.spinner.multipleTouchEnabled = NO;
|
|
|
|
self.spinner.opaque = NO;
|
|
|
|
self.spinner.userInteractionEnabled = NO;
|
|
|
|
[self.spinner stopAnimating];
|
|
|
|
|
|
|
|
self.closeButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(close)];
|
|
|
|
self.closeButton.enabled = YES;
|
|
|
|
|
|
|
|
UIBarButtonItem* flexibleSpaceButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
|
|
|
|
|
|
|
|
UIBarButtonItem* fixedSpaceButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
|
|
|
|
fixedSpaceButton.width = 20;
|
|
|
|
|
|
|
|
float toolbarY = toolbarIsAtBottom ? self.view.bounds.size.height - TOOLBAR_HEIGHT : 0.0;
|
|
|
|
CGRect toolbarFrame = CGRectMake(0.0, toolbarY, self.view.bounds.size.width, TOOLBAR_HEIGHT);
|
|
|
|
|
|
|
|
self.toolbar = [[UIToolbar alloc] initWithFrame:toolbarFrame];
|
|
|
|
self.toolbar.alpha = 1.000;
|
|
|
|
self.toolbar.autoresizesSubviews = YES;
|
|
|
|
self.toolbar.autoresizingMask = toolbarIsAtBottom ? (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin) : UIViewAutoresizingFlexibleWidth;
|
|
|
|
self.toolbar.barStyle = UIBarStyleBlackOpaque;
|
|
|
|
self.toolbar.clearsContextBeforeDrawing = NO;
|
|
|
|
self.toolbar.clipsToBounds = NO;
|
|
|
|
self.toolbar.contentMode = UIViewContentModeScaleToFill;
|
|
|
|
self.toolbar.hidden = NO;
|
|
|
|
self.toolbar.multipleTouchEnabled = NO;
|
|
|
|
self.toolbar.opaque = NO;
|
|
|
|
self.toolbar.userInteractionEnabled = YES;
|
|
|
|
if (_browserOptions.toolbarcolor != nil) { // Set toolbar color if user sets it in options
|
|
|
|
self.toolbar.barTintColor = [self colorFromHexString:_browserOptions.toolbarcolor];
|
|
|
|
}
|
|
|
|
if (!_browserOptions.toolbartranslucent) { // Set toolbar translucent to no if user sets it in options
|
|
|
|
self.toolbar.translucent = NO;
|
|
|
|
}
|
|
|
|
|
|
|
|
CGFloat labelInset = 5.0;
|
|
|
|
float locationBarY = toolbarIsAtBottom ? self.view.bounds.size.height - FOOTER_HEIGHT : self.view.bounds.size.height - LOCATIONBAR_HEIGHT;
|
|
|
|
|
|
|
|
self.addressLabel = [[UILabel alloc] initWithFrame:CGRectMake(labelInset, locationBarY, self.view.bounds.size.width - labelInset, LOCATIONBAR_HEIGHT)];
|
|
|
|
self.addressLabel.adjustsFontSizeToFitWidth = NO;
|
|
|
|
self.addressLabel.alpha = 1.000;
|
|
|
|
self.addressLabel.autoresizesSubviews = YES;
|
|
|
|
self.addressLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin;
|
|
|
|
self.addressLabel.backgroundColor = [UIColor clearColor];
|
|
|
|
self.addressLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
|
|
|
|
self.addressLabel.clearsContextBeforeDrawing = YES;
|
|
|
|
self.addressLabel.clipsToBounds = YES;
|
|
|
|
self.addressLabel.contentMode = UIViewContentModeScaleToFill;
|
|
|
|
self.addressLabel.enabled = YES;
|
|
|
|
self.addressLabel.hidden = NO;
|
|
|
|
self.addressLabel.lineBreakMode = NSLineBreakByTruncatingTail;
|
|
|
|
|
|
|
|
if ([self.addressLabel respondsToSelector:NSSelectorFromString(@"setMinimumScaleFactor:")]) {
|
|
|
|
[self.addressLabel setValue:@(10.0/[UIFont labelFontSize]) forKey:@"minimumScaleFactor"];
|
|
|
|
} else if ([self.addressLabel respondsToSelector:NSSelectorFromString(@"setMinimumFontSize:")]) {
|
|
|
|
[self.addressLabel setValue:@(10.0) forKey:@"minimumFontSize"];
|
|
|
|
}
|
|
|
|
|
|
|
|
self.addressLabel.multipleTouchEnabled = NO;
|
|
|
|
self.addressLabel.numberOfLines = 1;
|
|
|
|
self.addressLabel.opaque = NO;
|
|
|
|
self.addressLabel.shadowOffset = CGSizeMake(0.0, -1.0);
|
|
|
|
self.addressLabel.text = NSLocalizedString(@"Loading...", nil);
|
|
|
|
self.addressLabel.textAlignment = NSTextAlignmentLeft;
|
|
|
|
self.addressLabel.textColor = [UIColor colorWithWhite:1.000 alpha:1.000];
|
|
|
|
self.addressLabel.userInteractionEnabled = NO;
|
|
|
|
|
|
|
|
NSString* frontArrowString = NSLocalizedString(@"►", nil); // create arrow from Unicode char
|
|
|
|
self.forwardButton = [[UIBarButtonItem alloc] initWithTitle:frontArrowString style:UIBarButtonItemStylePlain target:self action:@selector(goForward:)];
|
|
|
|
self.forwardButton.enabled = YES;
|
|
|
|
self.forwardButton.imageInsets = UIEdgeInsetsZero;
|
|
|
|
if (_browserOptions.navigationbuttoncolor != nil) { // Set button color if user sets it in options
|
|
|
|
self.forwardButton.tintColor = [self colorFromHexString:_browserOptions.navigationbuttoncolor];
|
|
|
|
}
|
|
|
|
|
|
|
|
NSString* backArrowString = NSLocalizedString(@"◄", nil); // create arrow from Unicode char
|
|
|
|
self.backButton = [[UIBarButtonItem alloc] initWithTitle:backArrowString style:UIBarButtonItemStylePlain target:self action:@selector(goBack:)];
|
|
|
|
self.backButton.enabled = YES;
|
|
|
|
self.backButton.imageInsets = UIEdgeInsetsZero;
|
|
|
|
if (_browserOptions.navigationbuttoncolor != nil) { // Set button color if user sets it in options
|
|
|
|
self.backButton.tintColor = [self colorFromHexString:_browserOptions.navigationbuttoncolor];
|
|
|
|
}
|
|
|
|
|
|
|
|
// Filter out Navigation Buttons if user requests so
|
|
|
|
if (_browserOptions.hidenavigationbuttons) {
|
2019-02-28 11:43:34 +00:00
|
|
|
if (_browserOptions.lefttoright) {
|
|
|
|
[self.toolbar setItems:@[flexibleSpaceButton, self.closeButton]];
|
|
|
|
} else {
|
|
|
|
[self.toolbar setItems:@[self.closeButton, flexibleSpaceButton]];
|
|
|
|
}
|
|
|
|
} else if (_browserOptions.lefttoright) {
|
|
|
|
[self.toolbar setItems:@[self.backButton, fixedSpaceButton, self.forwardButton, flexibleSpaceButton, self.closeButton]];
|
2018-09-03 13:12:15 +01:00
|
|
|
} else {
|
2019-02-28 11:43:34 +00:00
|
|
|
[self.toolbar setItems:@[self.closeButton, flexibleSpaceButton, self.backButton, fixedSpaceButton, self.forwardButton]];
|
2018-09-03 13:12:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
self.view.backgroundColor = [UIColor grayColor];
|
|
|
|
[self.view addSubview:self.toolbar];
|
|
|
|
[self.view addSubview:self.addressLabel];
|
|
|
|
[self.view addSubview:self.spinner];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void) setWebViewFrame : (CGRect) frame {
|
|
|
|
NSLog(@"Setting the WebView's frame to %@", NSStringFromCGRect(frame));
|
|
|
|
[self.webView setFrame:frame];
|
|
|
|
}
|
|
|
|
|
2019-02-28 11:43:34 +00:00
|
|
|
- (void)setCloseButtonTitle:(NSString*)title : (NSString*) colorString : (int) buttonIndex
|
2018-09-03 13:12:15 +01:00
|
|
|
{
|
|
|
|
// the advantage of using UIBarButtonSystemItemDone is the system will localize it for you automatically
|
|
|
|
// but, if you want to set this yourself, knock yourself out (we can't set the title for a system Done button, so we have to create a new one)
|
|
|
|
self.closeButton = nil;
|
|
|
|
// Initialize with title if title is set, otherwise the title will be 'Done' localized
|
|
|
|
self.closeButton = title != nil ? [[UIBarButtonItem alloc] initWithTitle:title style:UIBarButtonItemStyleBordered target:self action:@selector(close)] : [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(close)];
|
|
|
|
self.closeButton.enabled = YES;
|
|
|
|
// If color on closebutton is requested then initialize with that that color, otherwise use initialize with default
|
|
|
|
self.closeButton.tintColor = colorString != nil ? [self colorFromHexString:colorString] : [UIColor colorWithRed:60.0 / 255.0 green:136.0 / 255.0 blue:230.0 / 255.0 alpha:1];
|
|
|
|
|
|
|
|
NSMutableArray* items = [self.toolbar.items mutableCopy];
|
2019-02-28 11:43:34 +00:00
|
|
|
[items replaceObjectAtIndex:buttonIndex withObject:self.closeButton];
|
2018-09-03 13:12:15 +01:00
|
|
|
[self.toolbar setItems:items];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)showLocationBar:(BOOL)show
|
|
|
|
{
|
|
|
|
CGRect locationbarFrame = self.addressLabel.frame;
|
|
|
|
|
|
|
|
BOOL toolbarVisible = !self.toolbar.hidden;
|
|
|
|
|
|
|
|
// prevent double show/hide
|
|
|
|
if (show == !(self.addressLabel.hidden)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (show) {
|
|
|
|
self.addressLabel.hidden = NO;
|
|
|
|
|
|
|
|
if (toolbarVisible) {
|
|
|
|
// toolBar at the bottom, leave as is
|
|
|
|
// put locationBar on top of the toolBar
|
|
|
|
|
|
|
|
CGRect webViewBounds = self.view.bounds;
|
|
|
|
webViewBounds.size.height -= FOOTER_HEIGHT;
|
|
|
|
[self setWebViewFrame:webViewBounds];
|
|
|
|
|
|
|
|
locationbarFrame.origin.y = webViewBounds.size.height;
|
|
|
|
self.addressLabel.frame = locationbarFrame;
|
|
|
|
} else {
|
|
|
|
// no toolBar, so put locationBar at the bottom
|
|
|
|
|
|
|
|
CGRect webViewBounds = self.view.bounds;
|
|
|
|
webViewBounds.size.height -= LOCATIONBAR_HEIGHT;
|
|
|
|
[self setWebViewFrame:webViewBounds];
|
|
|
|
|
|
|
|
locationbarFrame.origin.y = webViewBounds.size.height;
|
|
|
|
self.addressLabel.frame = locationbarFrame;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
self.addressLabel.hidden = YES;
|
|
|
|
|
|
|
|
if (toolbarVisible) {
|
|
|
|
// locationBar is on top of toolBar, hide locationBar
|
|
|
|
|
|
|
|
// webView take up whole height less toolBar height
|
|
|
|
CGRect webViewBounds = self.view.bounds;
|
|
|
|
webViewBounds.size.height -= TOOLBAR_HEIGHT;
|
|
|
|
[self setWebViewFrame:webViewBounds];
|
|
|
|
} else {
|
|
|
|
// no toolBar, expand webView to screen dimensions
|
|
|
|
[self setWebViewFrame:self.view.bounds];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)showToolBar:(BOOL)show : (NSString *) toolbarPosition
|
|
|
|
{
|
|
|
|
CGRect toolbarFrame = self.toolbar.frame;
|
|
|
|
CGRect locationbarFrame = self.addressLabel.frame;
|
|
|
|
|
|
|
|
BOOL locationbarVisible = !self.addressLabel.hidden;
|
|
|
|
|
|
|
|
// prevent double show/hide
|
|
|
|
if (show == !(self.toolbar.hidden)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (show) {
|
|
|
|
self.toolbar.hidden = NO;
|
|
|
|
CGRect webViewBounds = self.view.bounds;
|
|
|
|
|
|
|
|
if (locationbarVisible) {
|
|
|
|
// locationBar at the bottom, move locationBar up
|
|
|
|
// put toolBar at the bottom
|
|
|
|
webViewBounds.size.height -= FOOTER_HEIGHT;
|
|
|
|
locationbarFrame.origin.y = webViewBounds.size.height;
|
|
|
|
self.addressLabel.frame = locationbarFrame;
|
|
|
|
self.toolbar.frame = toolbarFrame;
|
|
|
|
} else {
|
|
|
|
// no locationBar, so put toolBar at the bottom
|
|
|
|
CGRect webViewBounds = self.view.bounds;
|
|
|
|
webViewBounds.size.height -= TOOLBAR_HEIGHT;
|
|
|
|
self.toolbar.frame = toolbarFrame;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ([toolbarPosition isEqualToString:kInAppBrowserToolbarBarPositionTop]) {
|
|
|
|
toolbarFrame.origin.y = 0;
|
|
|
|
webViewBounds.origin.y += toolbarFrame.size.height;
|
|
|
|
[self setWebViewFrame:webViewBounds];
|
|
|
|
} else {
|
|
|
|
toolbarFrame.origin.y = (webViewBounds.size.height + LOCATIONBAR_HEIGHT);
|
|
|
|
}
|
|
|
|
[self setWebViewFrame:webViewBounds];
|
|
|
|
|
|
|
|
} else {
|
|
|
|
self.toolbar.hidden = YES;
|
|
|
|
|
|
|
|
if (locationbarVisible) {
|
|
|
|
// locationBar is on top of toolBar, hide toolBar
|
|
|
|
// put locationBar at the bottom
|
|
|
|
|
|
|
|
// webView take up whole height less locationBar height
|
|
|
|
CGRect webViewBounds = self.view.bounds;
|
|
|
|
webViewBounds.size.height -= LOCATIONBAR_HEIGHT;
|
|
|
|
[self setWebViewFrame:webViewBounds];
|
|
|
|
|
|
|
|
// move locationBar down
|
|
|
|
locationbarFrame.origin.y = webViewBounds.size.height;
|
|
|
|
self.addressLabel.frame = locationbarFrame;
|
|
|
|
} else {
|
|
|
|
// no locationBar, expand webView to screen dimensions
|
|
|
|
[self setWebViewFrame:self.view.bounds];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)viewDidLoad
|
|
|
|
{
|
|
|
|
[super viewDidLoad];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)viewDidUnload
|
|
|
|
{
|
|
|
|
[self.webView loadHTMLString:nil baseURL:nil];
|
|
|
|
[CDVUserAgentUtil releaseLock:&_userAgentLockToken];
|
|
|
|
[super viewDidUnload];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (UIStatusBarStyle)preferredStatusBarStyle
|
|
|
|
{
|
|
|
|
return UIStatusBarStyleDefault;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL)prefersStatusBarHidden {
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)close
|
|
|
|
{
|
|
|
|
[CDVUserAgentUtil releaseLock:&_userAgentLockToken];
|
|
|
|
self.currentURL = nil;
|
|
|
|
|
|
|
|
if ((self.navigationDelegate != nil) && [self.navigationDelegate respondsToSelector:@selector(browserExit)]) {
|
|
|
|
[self.navigationDelegate browserExit];
|
|
|
|
}
|
|
|
|
|
|
|
|
__weak UIViewController* weakSelf = self;
|
|
|
|
|
|
|
|
// Run later to avoid the "took a long time" log message.
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
|
|
if ([weakSelf respondsToSelector:@selector(presentingViewController)]) {
|
|
|
|
[[weakSelf presentingViewController] dismissViewControllerAnimated:YES completion:^{
|
|
|
|
[[[[UIApplication sharedApplication] delegate] window] makeKeyAndVisible];
|
|
|
|
}];
|
|
|
|
} else {
|
|
|
|
[[weakSelf parentViewController] dismissViewControllerAnimated:YES completion:^{
|
|
|
|
[[[[UIApplication sharedApplication] delegate] window] makeKeyAndVisible];
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)navigateTo:(NSURL*)url
|
|
|
|
{
|
|
|
|
NSURLRequest* request = [NSURLRequest requestWithURL:url];
|
|
|
|
|
|
|
|
if (_userAgentLockToken != 0) {
|
|
|
|
[self.webView loadRequest:request];
|
|
|
|
} else {
|
|
|
|
__weak CDVUIInAppBrowserViewController* weakSelf = self;
|
|
|
|
[CDVUserAgentUtil acquireLock:^(NSInteger lockToken) {
|
|
|
|
_userAgentLockToken = lockToken;
|
|
|
|
[CDVUserAgentUtil setUserAgent:_userAgent lockToken:lockToken];
|
|
|
|
[weakSelf.webView loadRequest:request];
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)goBack:(id)sender
|
|
|
|
{
|
|
|
|
[self.webView goBack];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)goForward:(id)sender
|
|
|
|
{
|
|
|
|
[self.webView goForward];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)viewWillAppear:(BOOL)animated
|
|
|
|
{
|
|
|
|
if (IsAtLeastiOSVersion(@"7.0")) {
|
|
|
|
[[UIApplication sharedApplication] setStatusBarStyle:[self preferredStatusBarStyle]];
|
|
|
|
}
|
|
|
|
[self rePositionViews];
|
|
|
|
|
|
|
|
[super viewWillAppear:animated];
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// On iOS 7 the status bar is part of the view's dimensions, therefore it's height has to be taken into account.
|
|
|
|
// The height of it could be hardcoded as 20 pixels, but that would assume that the upcoming releases of iOS won't
|
|
|
|
// change that value.
|
|
|
|
//
|
|
|
|
- (float) getStatusBarOffset {
|
|
|
|
CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
|
|
|
|
float statusBarOffset = IsAtLeastiOSVersion(@"7.0") ? MIN(statusBarFrame.size.width, statusBarFrame.size.height) : 0.0;
|
|
|
|
return statusBarOffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void) rePositionViews {
|
|
|
|
if ([_browserOptions.toolbarposition isEqualToString:kInAppBrowserToolbarBarPositionTop]) {
|
|
|
|
[self.webView setFrame:CGRectMake(self.webView.frame.origin.x, TOOLBAR_HEIGHT, self.webView.frame.size.width, self.webView.frame.size.height)];
|
|
|
|
[self.toolbar setFrame:CGRectMake(self.toolbar.frame.origin.x, [self getStatusBarOffset], self.toolbar.frame.size.width, self.toolbar.frame.size.height)];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Helper function to convert hex color string to UIColor
|
|
|
|
// Assumes input like "#00FF00" (#RRGGBB).
|
|
|
|
// Taken from https://stackoverflow.com/questions/1560081/how-can-i-create-a-uicolor-from-a-hex-string
|
|
|
|
- (UIColor *)colorFromHexString:(NSString *)hexString {
|
|
|
|
unsigned rgbValue = 0;
|
|
|
|
NSScanner *scanner = [NSScanner scannerWithString:hexString];
|
|
|
|
[scanner setScanLocation:1]; // bypass '#' character
|
|
|
|
[scanner scanHexInt:&rgbValue];
|
|
|
|
return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16)/255.0 green:((rgbValue & 0xFF00) >> 8)/255.0 blue:(rgbValue & 0xFF)/255.0 alpha:1.0];
|
|
|
|
}
|
|
|
|
|
|
|
|
#pragma mark UIWebViewDelegate
|
|
|
|
|
|
|
|
- (void)webViewDidStartLoad:(UIWebView*)theWebView
|
|
|
|
{
|
|
|
|
// loading url, start spinner, update back/forward
|
|
|
|
|
|
|
|
self.addressLabel.text = NSLocalizedString(@"Loading...", nil);
|
|
|
|
self.backButton.enabled = theWebView.canGoBack;
|
|
|
|
self.forwardButton.enabled = theWebView.canGoForward;
|
|
|
|
|
|
|
|
NSLog(_browserOptions.hidespinner ? @"Yes" : @"No");
|
|
|
|
if(!_browserOptions.hidespinner) {
|
|
|
|
[self.spinner startAnimating];
|
|
|
|
}
|
|
|
|
|
|
|
|
return [self.navigationDelegate webViewDidStartLoad:theWebView];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL)webView:(UIWebView*)theWebView shouldStartLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType
|
|
|
|
{
|
|
|
|
BOOL isTopLevelNavigation = [request.URL isEqual:[request mainDocumentURL]];
|
|
|
|
|
|
|
|
if (isTopLevelNavigation) {
|
|
|
|
self.currentURL = request.URL;
|
|
|
|
}
|
|
|
|
return [self.navigationDelegate webView:theWebView shouldStartLoadWithRequest:request navigationType:navigationType];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)webViewDidFinishLoad:(UIWebView*)theWebView
|
|
|
|
{
|
|
|
|
// update url, stop spinner, update back/forward
|
|
|
|
|
|
|
|
self.addressLabel.text = [self.currentURL absoluteString];
|
|
|
|
self.backButton.enabled = theWebView.canGoBack;
|
|
|
|
self.forwardButton.enabled = theWebView.canGoForward;
|
|
|
|
|
|
|
|
[self.spinner stopAnimating];
|
|
|
|
|
|
|
|
// Work around a bug where the first time a PDF is opened, all UIWebViews
|
|
|
|
// reload their User-Agent from NSUserDefaults.
|
|
|
|
// This work-around makes the following assumptions:
|
|
|
|
// 1. The app has only a single Cordova Webview. If not, then the app should
|
|
|
|
// take it upon themselves to load a PDF in the background as a part of
|
|
|
|
// their start-up flow.
|
|
|
|
// 2. That the PDF does not require any additional network requests. We change
|
|
|
|
// the user-agent here back to that of the CDVViewController, so requests
|
|
|
|
// from it must pass through its white-list. This *does* break PDFs that
|
|
|
|
// contain links to other remote PDF/websites.
|
|
|
|
// More info at https://issues.apache.org/jira/browse/CB-2225
|
|
|
|
BOOL isPDF = [@"true" isEqualToString :[theWebView stringByEvaluatingJavaScriptFromString:@"document.body==null"]];
|
|
|
|
if (isPDF) {
|
|
|
|
[CDVUserAgentUtil setUserAgent:_prevUserAgent lockToken:_userAgentLockToken];
|
|
|
|
}
|
|
|
|
|
|
|
|
[self.navigationDelegate webViewDidFinishLoad:theWebView];
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)webView:(UIWebView*)theWebView didFailLoadWithError:(NSError*)error
|
|
|
|
{
|
|
|
|
// log fail message, stop spinner, update back/forward
|
|
|
|
NSLog(@"webView:didFailLoadWithError - %ld: %@", (long)error.code, [error localizedDescription]);
|
|
|
|
|
|
|
|
self.backButton.enabled = theWebView.canGoBack;
|
|
|
|
self.forwardButton.enabled = theWebView.canGoForward;
|
|
|
|
[self.spinner stopAnimating];
|
|
|
|
|
|
|
|
self.addressLabel.text = NSLocalizedString(@"Load Error", nil);
|
|
|
|
|
|
|
|
[self.navigationDelegate webView:theWebView didFailLoadWithError:error];
|
|
|
|
}
|
|
|
|
|
|
|
|
#pragma mark CDVScreenOrientationDelegate
|
|
|
|
|
|
|
|
- (BOOL)shouldAutorotate
|
|
|
|
{
|
|
|
|
if ((self.orientationDelegate != nil) && [self.orientationDelegate respondsToSelector:@selector(shouldAutorotate)]) {
|
|
|
|
return [self.orientationDelegate shouldAutorotate];
|
|
|
|
}
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (NSUInteger)supportedInterfaceOrientations
|
|
|
|
{
|
|
|
|
if ((self.orientationDelegate != nil) && [self.orientationDelegate respondsToSelector:@selector(supportedInterfaceOrientations)]) {
|
|
|
|
return [self.orientationDelegate supportedInterfaceOrientations];
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1 << UIInterfaceOrientationPortrait;
|
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
|
|
|
|
{
|
|
|
|
if ((self.orientationDelegate != nil) && [self.orientationDelegate respondsToSelector:@selector(shouldAutorotateToInterfaceOrientation:)]) {
|
|
|
|
return [self.orientationDelegate shouldAutorotateToInterfaceOrientation:interfaceOrientation];
|
|
|
|
}
|
|
|
|
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
|