github/cordova-plugin-inappbrowser
github/cordova-plugin-inappbrowser
3
0
Fork 1
mirror of https://github.com/shuto-cn/cordova-plugin-inappbrowser.git synced 2025-02-24 11:03:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix iOS 10 build

Browse Source
This commit is contained in:
Dave Alden 2018-09-30 08:03:16 +01:00
parent 27e6c67909
commit b48e02fcd5
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ios/CDVWKInAppBrowser.m
View File

@ -145,7 +145,15 @@ static CDVWKInAppBrowser* instance = nil;
} }
if (browserOptions.clearcache) { if (browserOptions.clearcache) {
bool isAtLeastiOS11 = false;
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
if (@available(iOS 11.0, *)) { if (@available(iOS 11.0, *)) {
isAtLeastiOS11 = true;
}
#endif
if(isAtLeastiOS11){
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
// Deletes all cookies // Deletes all cookies
WKHTTPCookieStore* cookieStore = dataStore.httpCookieStore; WKHTTPCookieStore* cookieStore = dataStore.httpCookieStore;
[cookieStore getAllCookies:^(NSArray* cookies) { [cookieStore getAllCookies:^(NSArray* cookies) {
@ -154,6 +162,7 @@ static CDVWKInAppBrowser* instance = nil;
[cookieStore deleteCookie:cookie completionHandler:nil]; [cookieStore deleteCookie:cookie completionHandler:nil];
} }
}]; }];
#endif
}else{ }else{
// https://stackoverflow.com/a/31803708/777265 // https://stackoverflow.com/a/31803708/777265
// Only deletes domain cookies (not session cookies) // Only deletes domain cookies (not session cookies)
@ -172,7 +181,14 @@ static CDVWKInAppBrowser* instance = nil;
} }
if (browserOptions.clearsessioncache) { if (browserOptions.clearsessioncache) {
bool isAtLeastiOS11 = false;
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
if (@available(iOS 11.0, *)) { if (@available(iOS 11.0, *)) {
isAtLeastiOS11 = true;
}
#endif
if (isAtLeastiOS11) {
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
// Deletes session cookies // Deletes session cookies
WKHTTPCookieStore* cookieStore = dataStore.httpCookieStore; WKHTTPCookieStore* cookieStore = dataStore.httpCookieStore;
[cookieStore getAllCookies:^(NSArray* cookies) { [cookieStore getAllCookies:^(NSArray* cookies) {
@ -183,11 +199,12 @@ static CDVWKInAppBrowser* instance = nil;
} }
} }
}]; }];
#endif
}else{ }else{
NSLog(@"clearsessioncache not available below iOS 11.0"); NSLog(@"clearsessioncache not available below iOS 11.0");
} }
} }
if (self.inAppBrowserViewController == nil) { if (self.inAppBrowserViewController == nil) {
NSString* userAgent = [CDVUserAgentUtil originalUserAgent]; NSString* userAgent = [CDVUserAgentUtil originalUserAgent];
NSString* overrideUserAgent = [self settingForKey:@"OverrideUserAgent"]; NSString* overrideUserAgent = [self settingForKey:@"OverrideUserAgent"];