Add initWithURLRequest method, credit to @filipbec

TransitApp · Jul 15, 2014 · caddabe · caddabe
2 parents d817284 + a8e2ce9
commit caddabe
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/SVWebViewController/SVModalWebViewController.h b/SVWebViewController/SVModalWebViewController.h
@@ -14,6 +14,7 @@
 
 - (instancetype)initWithAddress:(NSString*)urlString;
 - (instancetype)initWithURL:(NSURL *)URL;
+- (instancetype)initWithURLRequest:(NSURLRequest *)request;
 
 @property (nonatomic, strong) UIColor *barsTintColor;
 

diff --git a/SVWebViewController/SVModalWebViewController.m b/SVWebViewController/SVModalWebViewController.m
@@ -21,12 +21,16 @@ @implementation SVModalWebViewController
 #pragma mark - Initialization
 
 
-- (id)initWithAddress:(NSString*)urlString {
+- (instancetype)initWithAddress:(NSString*)urlString {
     return [self initWithURL:[NSURL URLWithString:urlString]];
 }
 
-- (id)initWithURL:(NSURL *)URL {
-    self.webViewController = [[SVWebViewController alloc] initWithURL:URL];
+- (instancetype)initWithURL:(NSURL *)URL {
+    return [self initWithURLRequest:[NSURLRequest requestWithURL:URL]];
+}
+
+- (instancetype)initWithURLRequest:(NSURLRequest *)request {
+    self.webViewController = [[SVWebViewController alloc] initWithURLRequest:request];
     if (self = [super initWithRootViewController:self.webViewController]) {
         UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
                                                                                     target:self.webViewController

diff --git a/SVWebViewController/SVWebViewController.h b/SVWebViewController/SVWebViewController.h
@@ -12,5 +12,6 @@
 
 - (instancetype)initWithAddress:(NSString*)urlString;
 - (instancetype)initWithURL:(NSURL*)URL;
+- (instancetype)initWithURLRequest:(NSURLRequest *)request;
 
 @end
diff --git a/SVWebViewController/SVWebViewController.m b/SVWebViewController/SVWebViewController.m
@@ -19,11 +19,9 @@ @interface SVWebViewController () <UIWebViewDelegate>
 @property (nonatomic, strong) UIBarButtonItem *actionBarButtonItem;
 
 @property (nonatomic, strong) UIWebView *webView;
-@property (nonatomic, strong) NSURL *URL;
+@property (nonatomic, strong) NSURLRequest *request;
 
-- (id)initWithAddress:(NSString*)urlString;
-- (id)initWithURL:(NSURL*)URL;
-- (void)loadURL:(NSURL*)URL;
+- (void)loadRequest:(NSURLRequest*)request;
 
 - (void)updateToolbarItems;
 
@@ -46,28 +44,31 @@ - (void)dealloc {
     self.webView.delegate = nil;
 }
 
-- (id)initWithAddress:(NSString *)urlString {
+- (instancetype)initWithAddress:(NSString *)urlString {
     return [self initWithURL:[NSURL URLWithString:urlString]];
 }
 
-- (id)initWithURL:(NSURL*)pageURL {
-
-    if(self = [super init]) {
-        self.URL = pageURL;
+- (instancetype)initWithURL:(NSURL*)pageURL {
+    return [self initWithRequest:[NSURLRequest requestWithURL:pageURL]];
+}
+
+- (instancetype)initWithRequest:(NSURLRequest*)request {
+    self = [super init];
+    if (self) {
+        self.request = request;
     }
-
     return self;
 }
 
-- (void)loadURL:(NSURL *)pageURL {
-    [self.webView loadRequest:[NSURLRequest requestWithURL:pageURL]];
+- (void)loadRequest:(NSURLRequest*)request {
+    [self.webView loadRequest:request];
 }
 
 #pragma mark - View lifecycle
 
 - (void)loadView {
     self.view = self.webView;
-    [self loadURL:self.URL];
+    [self loadRequest:self.request];
 }
 
 - (void)viewDidLoad {
@@ -265,10 +266,8 @@ - (void)stopClicked:(UIBarButtonItem *)sender {
 
 - (void)actionButtonClicked:(id)sender {
     NSArray *activities = @[[SVWebViewControllerActivitySafari new], [SVWebViewControllerActivityChrome new]];
-    NSURL *url = self.self.webView.request.URL;
-    if (!url || [[url absoluteString] isEqualToString:@""]) {
-        url = self.URL;
-    }
+
+    NSURL *url = self.webView.request.URL ? self.webView.request.URL : self.request.URL;
     if ([[url absoluteString] hasPrefix:@"file:///"]) {
         UIDocumentInteractionController *dc = [UIDocumentInteractionController interactionControllerWithURL:url];
         [dc presentOptionsMenuFromRect:self.view.bounds inView:self.view animated:YES];