new Cartfile & mod Media

Cartfile

@@ -1,17 +1,17 @@
-github "tilltue/TLPhotoPicker"
-github "kishikawakatsumi/UICKeyChainStore"
+github "tilltue/TLPhotoPicker" == 1.8.3
+github "kishikawakatsumi/UICKeyChainStore" == 2.1.2
 github "danielsaidi/Sheeeeeeeeet" == 1.2.2
-github "sgr-ksmt/PDFGenerator" ~> 2.1
-github "MortimerGoro/MGSwipeTableCell"
-github "dzenbot/DZNEmptyDataSet"
-github "ealeksandrov/EAIntroView"
-github "calimarkus/JDStatusBarNotification"
-github "ChangbaDevs/KTVHTTPCache" ~> 1.1.7
-github "jdg/MBProgressHUD" ~> 1.1.0
-github "realm/realm-cocoa"
-github "SVGKit/SVGKit" "2.x"
+github "sgr-ksmt/PDFGenerator" == 2.1
+github "MortimerGoro/MGSwipeTableCell" == 1.6.8
+github "dzenbot/DZNEmptyDataSet" == 1.8.1
+github "ealeksandrov/EAIntroView" == 2.12.0
+github "calimarkus/JDStatusBarNotification" == 1.6.0
+github "ChangbaDevs/KTVHTTPCache" == 2.0.0
+github "jdg/MBProgressHUD" == 1.1.0
+github "realm/realm-cocoa" == 3.13.1
+github "SVGKit/SVGKit" == 2.1.0
 github "WeTransfer/WeScan" == 0.9.1
-github "malcommac/SwiftRichString"
+github "malcommac/SwiftRichString" == 2.0.1
 github "https://github.com/marinofaggiana/FastScroll" "master"
 github "yannickl/QRCodeReader.swift" >= 10.0.0
 github "marmelroy/Zip"

Carthage/Checkouts/KTVHTTPCache/KTVHTTPCache/Classes/KTVHCHTTPServer/KTVHCHTTPRequest.m

@@ -1,31 +0,0 @@
-//
-//  KTVHCHTTPRequest.m
-//  KTVHTTPCache
-//
-//  Created by Single on 2017/8/10.
-//  Copyright © 2017年 Single. All rights reserved.
-//
-
-#import "KTVHCHTTPRequest.h"
-#import "KTVHCLog.h"
-
-@implementation KTVHCHTTPRequest
-
-- (instancetype)initWithURL:(NSURL *)URL headers:(NSDictionary *)headers
-{
-    if (self = [super init])
-    {
-        KTVHCLogAlloc(self);
-        _URL = URL;
-        _headers = headers;
-        KTVHCLogHTTPRequest(@"%p, Create reqeust\nURL : %@\nHeaders : %@", self, self.URL, self.headers);
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    KTVHCLogDealloc(self);
-}
-
-@end

iOSClient/Viewer/NCViewerMedia.swift

@@ -122,27 +122,24 @@ class NCViewerMedia: NSObject {
     
     @objc func setupHTTPCache() {
         
-        var error: NSError?
-
         KTVHTTPCache.cacheSetMaxCacheLength(Int64(k_maxHTTPCache))
         
         if ProcessInfo.processInfo.environment["SIMULATOR_DEVICE_NAME"] != nil {
             KTVHTTPCache.logSetConsoleLogEnable(true)
         }
         
-        KTVHTTPCache.proxyStart(&error)
-        if error == nil {
-            print("Proxy Start Success")
-        } else {
-            print("Proxy Start error : \(error!)")
+        do {
+            try KTVHTTPCache.proxyStart()
+        } catch let error {
+            print("Proxy Start error : \(error)")
         }
-    
-        KTVHTTPCache.tokenSetURLFilter { (url) -> URL? in
+        
+        KTVHTTPCache.encodeSetURLConverter { (url) -> URL? in
             print("URL Filter reviced URL : " + String(describing: url))
             return url
         }
         
-        KTVHTTPCache.downloadSetUnsupportContentTypeFilter { (url, contentType) -> Bool in
+        KTVHTTPCache.downloadSetUnacceptableContentTypeDisposer { (url, contentType) -> Bool in
             print("Unsupport Content-Type Filter reviced URL : " + String(describing: url) + " " + String(describing: contentType))
             return false
         }