From a28b840f1e896c36c72c728b814b932711c3f19c Mon Sep 17 00:00:00 2001 From: Chris Li Date: Thu, 29 Sep 2016 17:04:15 -0400 Subject: [PATCH] refactor --- .../Main/MainControllerDelegates.swift | 45 ------------------- Kiwix-iOS/Info.plist | 2 +- Kiwix-iOSWidgets/Bookmarks/Info.plist | 2 +- 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift index 93f84324..7869ec3d 100644 --- a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift +++ b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift @@ -120,55 +120,10 @@ extension MainController: UIWebViewDelegate, SFSafariViewControllerDelegate, LPT GlobalQueue.shared.add(load: operation) } - - // MARK: - UIPopoverPresentationControllerDelegate func adaptivePresentationStyleForPresentationController(controller: UIPresentationController, traitCollection: UITraitCollection) -> UIModalPresentationStyle { return .None } -// -// func webView(webView: UIWebView, shouldStartLoadWithRequest request: NSURLRequest, navigationType: UIWebViewNavigationType) -> Bool { -// guard let url = request.URL else {return true} -// if url.scheme == "kiwix" { -// return true -// } else { -// let svc = SFSafariViewController(URL: url) -// svc.delegate = self -// presentViewController(svc, animated: true, completion: nil) -// return false -// } -// } -// -// func webViewDidStartLoad(webView: UIWebView) { -// PacketAnalyzer.sharedInstance.startListening() -// } -// -// func webViewDidFinishLoad(webView: UIWebView) { -// guard let url = webView.request?.URL else {return} -// guard url.scheme!.caseInsensitiveCompare("Kiwix") == .OrderedSame else {return} -// -// let title = webView.stringByEvaluatingJavaScriptFromString("document.title") -// let managedObjectContext = UIApplication.appDelegate.managedObjectContext -// guard let bookID = url.host else {return} -// guard let book = Book.fetch(bookID, context: managedObjectContext) else {return} -// guard let article = Article.addOrUpdate(title, url: url, book: book, context: managedObjectContext) else {return} -// -// self.article = article -// if let image = PacketAnalyzer.sharedInstance.chooseImage() { -// article.thumbImageURL = image.url.absoluteString -// } -// -// configureSearchBarPlaceHolder() -// injectTableWrappingJavaScriptIfNeeded() -// adjustFontSizeIfNeeded() -// configureNavigationButtonTint() -// configureBookmarkButton() -// - -// -// PacketAnalyzer.sharedInstance.stopListening() -// } - } diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 63ead068..e27baae2 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.1487 + 1.8.1488 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 487a713f..cce5dc45 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.1491 + 1.8.1492 NSExtension NSExtensionMainStoryboard