Marino Faggiana 6 년 전
부모
커밋
20eda4b8d0
3개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      Nextcloud.xcodeproj/project.pbxproj
  2. 0 3
      iOSClient/Library/SwiftWebVC/SwiftWebVC.swift
  3. 4 1
      iOSClient/Library/SwiftWebVC/WKCookieWebView.swift

+ 1 - 1
Nextcloud.xcodeproj/project.pbxproj

@@ -2399,8 +2399,8 @@
 			children = (
 				F7B1FBB01E72E3D1001781FE /* Resources */,
 				F734A8BE21B59137009DE2E8 /* WKCookieWebView.swift */,
-				F7B1FBBF1E72E3D1001781FE /* SwiftModalWebVC.swift */,
 				F7B1FBC01E72E3D1001781FE /* SwiftWebVC.swift */,
+				F7B1FBBF1E72E3D1001781FE /* SwiftModalWebVC.swift */,
 				F7B1FBC11E72E3D1001781FE /* SwiftWebVCActivity.swift */,
 				F7B1FBC21E72E3D1001781FE /* SwiftWebVCActivityChrome.swift */,
 				F7B1FBC31E72E3D1001781FE /* SwiftWebVCActivitySafari.swift */,

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

@@ -104,9 +104,6 @@ public class SwiftWebVC: UIViewController {
         self.init()
         self.useRedirectCookieHandling = useRedirectCookieHandling
         self.request = aRequest
-        self.request.addValue("true", forHTTPHeaderField: "OCS-APIRequest")
-        let language = NSLocale.preferredLanguages[0] as String
-        self.request.addValue(language, forHTTPHeaderField: "Accept-Language")
         self.hideToolbar = hideToolbar
     }
     

+ 4 - 1
iOSClient/Library/SwiftWebVC/WKCookieWebView.swift

@@ -43,8 +43,11 @@ class WKCookieWebView : WKWebView {
     override func load(_ request: URLRequest) -> WKNavigation? {
         
         var request = request
-
+        let language = NSLocale.preferredLanguages[0] as String
+        
         request.setValue(CCUtility.getUserAgent(), forHTTPHeaderField: "User-Agent")
+        request.addValue("true", forHTTPHeaderField: "OCS-APIRequest")
+        request.addValue(language, forHTTPHeaderField: "Accept-Language")
 
         guard useRedirectCookieHandling else {
             return super.load(request)