Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/ios/CDVThemeableBrowser.m
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ - (CDVThemeableBrowser*)initWithWebView:(UIWebView*)theWebView
return self;
}

- (id)settingForKey:(NSString*)key
{
return [self.commandDelegate.settings objectForKey:[key lowercaseString]];
}

- (void)onReset
{
[self close:nil];
Expand Down Expand Up @@ -216,9 +221,18 @@ - (void)openInThemeableBrowser:(NSURL*)url withOptions:(NSString*)options
}

if (self.themeableBrowserViewController == nil) {
NSString* originalUA = [CDVUserAgentUtil originalUserAgent];
NSString* userAgent = [CDVUserAgentUtil originalUserAgent];
NSString* overrideUserAgent = [self settingForKey:@"OverrideUserAgent"];
if (overrideUserAgent) {
userAgent = overrideUserAgent;
} else {
NSString* appendUserAgent = [self settingForKey:@"AppendUserAgent"];
if(appendUserAgent) {
userAgent = [userAgent stringByAppendingString: appendUserAgent];
}
}
self.themeableBrowserViewController = [[CDVThemeableBrowserViewController alloc]
initWithUserAgent:originalUA prevUserAgent:[self.commandDelegate userAgent]
initWithUserAgent:userAgent prevUserAgent:[self.commandDelegate userAgent]
browserOptions: browserOptions
navigationDelete:self
statusBarStyle:[UIApplication sharedApplication].statusBarStyle];
Expand Down