Merge branch 'master' into feat/customurlscheme-ios

Author: kumo01GitHub

src/ios/CDVWKInAppBrowser.h

@@ -45,7 +45,6 @@ typedef NSDictionary CDVSettingsDictionary;
 @property (nonatomic, retain) CDVWKInAppBrowser *instance;
 @property (nonatomic, retain) CDVWKInAppBrowserViewController *inAppBrowserViewController;
 @property (nonatomic, copy) NSString *callbackId;
-@property (nonatomic, copy) NSRegularExpression *callbackIdPattern;
 
 + (id) getInstance;
 - (void)open:(CDVInvokedUrlCommand *)command;

src/ios/CDVWKInAppBrowser.m

@@ -44,7 +44,6 @@ + (id)getInstance
 - (void)pluginInitialize
 {
     instance = self;
-    _callbackIdPattern = nil;
     _beforeload = @"";
     _waitForBeforeload = NO;
 }
@@ -414,38 +413,6 @@ - (void)injectStyleFile:(CDVInvokedUrlCommand *)command
     [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;
-}
-
-- (BOOL)isAllowedScheme:(NSString *)scheme
-{
-    NSString *allowedSchemesPreference = [_settings cordovaSettingForKey:@"AllowedSchemes"];
-    if (allowedSchemesPreference == nil || [allowedSchemesPreference isEqualToString:@""]) {
-        // Preference missing.
-        return NO;
-    }
-    for (NSString *allowedScheme in [allowedSchemesPreference componentsSeparatedByString:@","]) {
-        if ([allowedScheme isEqualToString:scheme]) {
-            return YES;
-        }
-    }
-    return NO;
-}
-
 /**
  * The message handler 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