feat: update module

ios/Classes/TiWebdialogAuthenticationSessionProxy.h

@@ -6,16 +6,12 @@
  * Please see the LICENSE included with this distribution for details.
  */
 
-#import "TiProxy.h"
+#import <TitaniumKit/TitaniumKit.h>
 #import <AuthenticationServices/AuthenticationServices.h>
 
-#if IS_IOS_13
 @interface TiWebdialogAuthenticationSessionProxy : TiProxy <ASWebAuthenticationPresentationContextProviding>
-#else
-@interface TiWebdialogAuthenticationSessionProxy : TiProxy
-#endif
 {
-  id _authSession;
+  ASWebAuthenticationSession *_authSession;
 }
 
 #pragma mark Public API's

ios/Classes/TiWebdialogAuthenticationSessionProxy.m

@@ -7,35 +7,23 @@
  */
 
 #import "TiWebdialogAuthenticationSessionProxy.h"
-#import "TiUtils.h"
 #import <SafariServices/SafariServices.h>
 
 @implementation TiWebdialogAuthenticationSessionProxy
 
-- (id)authSession
+- (ASWebAuthenticationSession *)authSession
 {
   if (_authSession == nil) {
     NSString *url = [TiUtils stringValue:[self valueForKey:@"url"]];
     NSString *scheme = [TiUtils stringValue:[self valueForKey:@"scheme"]];
 
-    if ([TiUtils isIOSVersionOrGreater:@"12.0"]) {
-      _authSession = [[ASWebAuthenticationSession alloc] initWithURL:[TiUtils toURL:url proxy:self]
-                                                   callbackURLScheme:scheme
-                                                   completionHandler:^(NSURL *_Nullable callbackURL, NSError *_Nullable error) {
-                                                     [self fireEventWithCallbackUrl:callbackURL andError:error];
-                                                   }];
-#if IS_IOS_13
-      if ([TiUtils isIOSVersionOrGreater:@"13.0"]) {
-        ((ASWebAuthenticationSession *)_authSession).presentationContextProvider = self;
-      }
-#endif
-    } else {
-      _authSession = [[SFAuthenticationSession alloc] initWithURL:[TiUtils toURL:url proxy:self]
-                                                callbackURLScheme:scheme
-                                                completionHandler:^(NSURL *callbackURL, NSError *error) {
-                                                  [self fireEventWithCallbackUrl:callbackURL andError:error];
-                                                }];
-    }
+    _authSession = [[ASWebAuthenticationSession alloc] initWithURL:[TiUtils toURL:url proxy:self]
+                                                 callbackURLScheme:scheme
+                                                 completionHandler:^(NSURL *_Nullable callbackURL, NSError *_Nullable error) {
+                                                   [self fireEventWithCallbackUrl:callbackURL andError:error];
+                                                 }];
+
+    _authSession.presentationContextProvider = self;
   }
 
   return _authSession;
@@ -71,12 +59,7 @@ - (ASPresentationAnchor)presentationAnchorForWebAuthenticationSession:(ASWebAuth
 
 - (void)start:(id)unused
 {
-  id session = [self authSession];
-  if ([session isKindOfClass:[SFAuthenticationSession class]]) {
-    [(SFAuthenticationSession *)session start];
-  } else if ([session isKindOfClass:[ASWebAuthenticationSession class]]) {
-    [(ASWebAuthenticationSession *)session start];
-  }
+  [[self authSession] start];
 }
 
 - (void)cancel:(id)unused
@@ -86,7 +69,7 @@ - (void)cancel:(id)unused
 
 - (NSNumber *)isSupported:(id)unused
 {
-  return NUMBOOL([TiUtils isIOSVersionOrGreater:@"11.0"]);
+  return @(YES);
 }
 
 @end

ios/Classes/TiWebdialogModule.h

@@ -6,7 +6,7 @@
  * Please see the LICENSE included with this distribution for details.
  */
 
-#import "TiModule.h"
+#import <TitaniumKit/TitaniumKit.h>
 #import <SafariServices/SafariServices.h>
 
 @interface TiWebdialogModule : TiModule <SFSafariViewControllerDelegate> {

ios/Classes/TiWebdialogModule.m

@@ -7,10 +7,6 @@
  */
 
 #import "TiWebdialogModule.h"
-#import "TiApp.h"
-#import "TiBase.h"
-#import "TiHost.h"
-#import "TiUtils.h"
 
 @implementation TiWebdialogModule
 
@@ -65,17 +61,12 @@ - (SFSafariViewController *)safariController:(NSString *)url withEntersReaderIfA
     NSString *encodedURL = [url stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
     NSURL *safariURL = [NSURL URLWithString:encodedURL];
 
-    if (@available(iOS 11.0, *)) {
-      SFSafariViewControllerConfiguration *config = [[SFSafariViewControllerConfiguration alloc] init];
-      config.entersReaderIfAvailable = entersReaderIfAvailable;
-      config.barCollapsingEnabled = barCollapsingEnabled;
+    SFSafariViewControllerConfiguration *config = [[SFSafariViewControllerConfiguration alloc] init];
+    config.entersReaderIfAvailable = entersReaderIfAvailable;
+    config.barCollapsingEnabled = barCollapsingEnabled;
 
-      _safariController = [[SFSafariViewController alloc] initWithURL:safariURL
-                                                        configuration:config];
-    } else {
-      _safariController = [[SFSafariViewController alloc] initWithURL:safariURL
-                                              entersReaderIfAvailable:entersReaderIfAvailable];
-    }
+    _safariController = [[SFSafariViewController alloc] initWithURL:safariURL
+                                                      configuration:config];
 
     [_safariController setDelegate:self];
   }
@@ -160,11 +151,7 @@ - (void)open:(id)args
   }
 
   if ([args objectForKey:@"dismissButtonStyle"]) {
-    if (@available(iOS 11.0, *)) {
-      [safari setDismissButtonStyle:[TiUtils intValue:@"dismissButtonStyle" properties:args def:SFSafariViewControllerDismissButtonStyleDone]];
-    } else {
-      NSLog(@"[ERROR] Ti.WebDialog: The dismissButtonStyle property is only available in iOS 11 and later");
-    }
+    [safari setDismissButtonStyle:[TiUtils intValue:@"dismissButtonStyle" properties:args def:SFSafariViewControllerDismissButtonStyleDone]];
   }
 
   [[TiApp app] showModalController:safari

ios/manifest

@@ -2,17 +2,18 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.0.2
+version: 4.0.0
 apiversion: 2
-architectures: armv7 arm64 i386 x86_64
+architectures: arm64 x86_64
 description: titanium-web-dialog
 author: Hans Knoechel
 license: Apache 2.0
-copyright: Copyright (c) 2017-present by Axway Appcelerator
+mac: false
+copyright: Copyright (c) 2017-present by TiDev
 
 # these should not be edited
 name: titanium-web-dialog
 moduleid: ti.webdialog
 guid: 1f19cce1-0ad7-4e25-ab3b-0666f54a0a49
 platform: iphone
-minsdk: 9.2.0
+minsdk: 12.0.0