fixing crashing on save static pdf

derekblair · Mar 22, 2017 · 34ab0c2 · 34ab0c2
1 parent 1af3757
commit 34ab0c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/ILPDFKit/Controller/ILPDFViewController.m b/ILPDFKit/Controller/ILPDFViewController.m
@@ -40,6 +40,11 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIV
     }
 }
 
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+}
+
 #pragma mark - ILPDFViewController
 
 #pragma mark - Setting the Document
@@ -57,8 +62,8 @@ - (void)reload {
 #pragma mark - Private
 
 - (void)loadPDFView {
-    if (self.pdfView.superview != nil) {
-        [self.pdfView removeFromSuperview];
+    if (_pdfView.superview != nil) {
+        [_pdfView removeFromSuperview];
     }
     _pdfView = [[ILPDFView alloc] initWithDocument:_document];
     [self.view addSubview:_pdfView];

diff --git a/ILPDFKit/View/ILPDFView.m b/ILPDFKit/View/ILPDFView.m
@@ -56,12 +56,14 @@ - (void)didMoveToWindow {
         [_pdfView removeFromSuperview];
         _pdfView = nil;
         _uiWebPDFView = nil;
+        return;
     }
     if ([_pdfDocument.documentPath isKindOfClass:[NSString class]]) {
         [self.pdfView loadRequest:[NSURLRequest requestWithURL:[NSURL fileURLWithPath:_pdfDocument.documentPath]]];
-    } else  {
-        [self.pdfView loadData:_pdfDocument.documentData MIMEType:ILPDFMIMEType characterEncodingName:ILPDFCharEncoding baseURL:[NSURL URLWithString:@"/"]];
+    } else if (_pdfDocument)  {
+        [self.pdfView loadData:_pdfDocument.documentData MIMEType:ILPDFMIMEType characterEncodingName:ILPDFCharEncoding baseURL:nil];
     }
+
 }
 
 - (void)layoutSubviews {
@@ -86,7 +88,6 @@ - (instancetype)initWithDocument:(ILPDFDocument *)document {
         _tapGestureRecognizer.delegate = self;
         [self addSubview:self.pdfView];
         [self.pdfView pinToSuperview:UIEdgeInsetsZero];
-
     }
     return self;
 }

diff --git a/ILPDFKitExample/ILPDFKitExample/AppDelegate.swift b/ILPDFKitExample/ILPDFKitExample/AppDelegate.swift
@@ -56,9 +56,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         let savedVCDocument = ILPDFDocument(data: data!)
 
-        let alert : UIAlertController = UIAlertController(title: "Will Save PDF", message: "The PDF file displayed next is a static version of the previous file, but with the form values added. The starting PDF has not been modified and this static pdf no longer contains forms.", preferredStyle: .alert)
+        let alert = UIAlertController(title: "Will Save PDF", message: "The PDF file displayed next is a static version of the previous file, but with the form values added. The starting PDF has not been modified and this static pdf no longer contains forms.", preferredStyle: .alert)
 
-        let action = UIAlertAction(title: "Show Saved Static PDF", style: .default) { (_ : UIAlertAction) in
+        let action = UIAlertAction(title: "Show Saved Static PDF", style: .default) { _ in
             alert.dismiss(animated: true, completion: nil)
             self.pdfVC?.document = savedVCDocument
             self.pdfVC?.navigationItem.setRightBarButton(nil, animated: false)