diff --git a/Kiwix-iOS/Controller/Main/MainDelegates.swift b/Kiwix-iOS/Controller/Main/MainDelegates.swift index 399be9fb..f55ec597 100644 --- a/Kiwix-iOS/Controller/Main/MainDelegates.swift +++ b/Kiwix-iOS/Controller/Main/MainDelegates.swift @@ -24,19 +24,21 @@ extension MainController: UIWebViewDelegate, SFSafariViewControllerDelegate { } func webViewDidStartLoad(_ webView: UIWebView) { + URLResponseCache.shared.start() } func webViewDidFinishLoad(_ webView: UIWebView) { JS.preventDefaultLongTap(webView: webView) - guard let title = JS.getTitle(from: webView) else {return} - searchBar.title = title + URLResponseCache.shared.stop() buttons.back.tintColor = webView.canGoBack ? nil : UIColor.gray buttons.forward.tintColor = webView.canGoForward ? nil : UIColor.gray + + guard let title = JS.getTitle(from: webView) else {return} + searchBar.title = title } func webView(_ webView: UIWebView, didFailLoadWithError error: Error) { - } } diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 7f449622..149a2707 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.3367 + 1.8.3378 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 93cd9e6a..bdcb00e8 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.3367 + 1.8.3378 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix/Operations/ArticleOperation.swift b/Kiwix/Operations/ArticleOperation.swift index cfab46ce..1745c484 100644 --- a/Kiwix/Operations/ArticleOperation.swift +++ b/Kiwix/Operations/ArticleOperation.swift @@ -85,9 +85,10 @@ class ArticleLoadOperation: Procedure { } self.finish() - - -// //if main.traitCollection.horizontalSizeClass == .compact {main.hideTableOfContentsController()} } } } + +class BookmarkAddOperation: Procedure { + +} diff --git a/Kiwix/libkiwix/ZimReader.mm b/Kiwix/libkiwix/ZimReader.mm index ed12f100..31dd549a 100755 --- a/Kiwix/libkiwix/ZimReader.mm +++ b/Kiwix/libkiwix/ZimReader.mm @@ -301,22 +301,14 @@ int levenshtein_distance(const std::string &s1, const std::string &s2) } - (NSString *)getFavicon { -// NSData *data; -// string content; -// string mimeType; -// if (_reader->getFavicon(content, mimeType)) { -// data = [NSData dataWithBytes:content.c_str() length:content.length()]; -// } -// return data; - - string contentC; + NSData *data; + string content; string mimeType; - NSString *content; - - if (_reader->getFavicon(contentC, mimeType)) { - content = [NSString stringWithCString:contentC.c_str() encoding:NSUTF8StringEncoding]; + if (_reader->getFavicon(content, mimeType)) { + data = [NSData dataWithBytes:content.c_str() length:content.length()]; } - return content; + NSString * str = [data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed]; + return str; } - (NSString *)parseURL:(NSString *)urlPath {