Marino Faggiana 8 лет назад
Родитель
Сommit
711915de3e

+ 2 - 0
iOSClient/AppDelegate.m

@@ -55,6 +55,8 @@
     [iRate sharedInstance].usesUntilPrompt = 10;
     [iRate sharedInstance].promptForNewVersionIfUserRated = true;
     
+    [[NSUserDefaults standardUserDefaults] registerDefaults:@{@"UserAgent": [CCUtility getUserAgent]}];
+
     //enable preview mode
     //[iRate sharedInstance].previewMode = YES;
 }

+ 19 - 0
iOSClient/Library/SwiftWebVC/SwiftWebVC.swift

@@ -323,6 +323,25 @@ extension SwiftWebVC: WKNavigationDelegate {
         
     }
     
+    public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+        
+        if #available(iOS 9.0, *) {
+            decisionHandler(.allow)
+        } else {
+            
+            let userAgent : String = CCUtility.getUserAgent()
+
+            if (navigationAction.request.value(forHTTPHeaderField: "User-Agent") == userAgent) {
+                decisionHandler(.allow)
+            } else {
+                let newRequest : NSMutableURLRequest = navigationAction.request as! NSMutableURLRequest
+                newRequest.setValue(userAgent, forHTTPHeaderField: "User-Agent")
+                decisionHandler(.cancel)
+                webView.load(newRequest as URLRequest)
+            }
+        }
+    }
+    
     public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
         self.delegate?.didFinishLoading(success: false)
         self.delegate?.didFinishLoading(success: false, url: webView.url!)

+ 0 - 7
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1155,13 +1155,6 @@
         
         // Select type of session
         
-        /*
-        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == NO) session = k_upload_session;
-        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == NO) session = k_upload_session;
-        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount]) session = k_upload_session_wwan;
-        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount]) session = k_upload_session_wwan;
-         */
-        
         if (assetMediaType == PHAssetMediaTypeImage && tableAccount.cameraUploadWWAnPhoto == NO) session = k_upload_session;
         if (assetMediaType == PHAssetMediaTypeVideo && tableAccount.cameraUploadWWAnVideo == NO) session = k_upload_session;
         if (assetMediaType == PHAssetMediaTypeImage && tableAccount.cameraUploadWWAnPhoto) session = k_upload_session_wwan;