@@ -49,7 +49,7 @@ - (void)teardown
4949    [self  fireEvent: @" close" 
5050         withObject: @{
5151           @" success" NUMINT (YES ),
52-            @" url" stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding ]
52+            @" url" stringByRemovingPercentEncoding ]
5353         }];
5454  }
5555}
@@ -62,19 +62,13 @@ - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller
6262- (SFSafariViewController *)safariController : (NSString  *)url  withEntersReaderIfAvailable : (BOOL )entersReaderIfAvailable  andBarCollapsingEnabled : (BOOL )barCollapsingEnabled 
6363{
6464  if  (_safariController == nil ) {
65-     NSURL  *safariURL = [NSURL  URLWithString: [url stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
66-     if  (@available (iOS 11.0 , *)) {
67-       SFSafariViewControllerConfiguration *config = [[SFSafariViewControllerConfiguration alloc ] init ];
68-       config.entersReaderIfAvailable  = entersReaderIfAvailable;
69-       config.barCollapsingEnabled  = barCollapsingEnabled;
70- 
71-       _safariController = [[SFSafariViewController alloc ] initWithURL: safariURL
72-                                                         configuration: config];
73-     } else  {
74-       _safariController = [[SFSafariViewController alloc ] initWithURL: safariURL
75-                                               entersReaderIfAvailable: entersReaderIfAvailable];
76-     }
65+     NSURL  *safariURL = [NSURL  URLWithString: [url stringByRemovingPercentEncoding ]];
66+     SFSafariViewControllerConfiguration *config = [[SFSafariViewControllerConfiguration alloc ] init ];
67+     config.entersReaderIfAvailable  = entersReaderIfAvailable;
68+     config.barCollapsingEnabled  = barCollapsingEnabled;
7769
70+     _safariController = [[SFSafariViewController alloc ] initWithURL: safariURL
71+                                                       configuration: config];
7872    [_safariController setDelegate: self ];
7973  }
8074
@@ -86,7 +80,7 @@ - (void)safariViewController:(SFSafariViewController *)controller didCompleteIni
8680  if  ([self  _hasListeners: @" load" 
8781    [self  fireEvent: @" load" 
8882         withObject: @{
89-            @" url" stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding ],
83+            @" url" stringByRemovingPercentEncoding ],
9084           @" success" NUMBOOL (didLoadSuccessfully)
9185         }];
9286  }
@@ -97,7 +91,7 @@ - (void)safariViewController:(SFSafariViewController *)controller initialLoadDid
9791  if  ([self  _hasListeners: @" redirect" 
9892    [self  fireEvent: @" redirect" 
9993         withObject: @{
100-            @" url" stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding ]
94+            @" url" stringByRemovingPercentEncoding ]
10195         }];
10296  }
10397}
@@ -150,28 +144,15 @@ - (void)open:(id)args
150144
151145  if  ([args objectForKey: @" tintColor" 
152146    TiColor *newColor = [TiUtils colorValue: @" tintColor" properties: args];
153- 
154-     if  ([TiUtils isIOSVersionOrGreater: @" 10.0" 
155-       [safari setPreferredControlTintColor: [newColor _color ]];
156-     } else  {
157-       [[safari view ] setTintColor: [newColor _color ]];
158-     }
147+     [safari setPreferredControlTintColor: [newColor _color ]];
159148  }
160149
161150  if  ([args objectForKey: @" barColor" 
162-     if  ([TiUtils isIOSVersionOrGreater: @" 10.0" 
163-       [safari setPreferredBarTintColor: [[TiUtils colorValue: @" barColor" properties: args] _color ]];
164-     } else  {
165-       NSLog (@" [ERROR] Ti.WebDialog: The barColor property is only available in iOS 10 and later" 
166-     }
151+     [safari setPreferredBarTintColor: [[TiUtils colorValue: @" barColor" properties: args] _color ]];
167152  }
168153
169154  if  ([args objectForKey: @" dismissButtonStyle" 
170-     if  (@available (iOS 11.0 , *)) {
171-       [safari setDismissButtonStyle: [TiUtils intValue: @" dismissButtonStyle" properties: args def: SFSafariViewControllerDismissButtonStyleDone]];
172-     } else  {
173-       NSLog (@" [ERROR] Ti.WebDialog: The dismissButtonStyle property is only available in iOS 11 and later" 
174-     }
155+     [safari setDismissButtonStyle: [TiUtils intValue: @" dismissButtonStyle" properties: args def: SFSafariViewControllerDismissButtonStyleDone]];
175156  }
176157
177158  [[TiApp app ] showModalController: safari
0 commit comments