Release 2.6.1 Update 3

1. Fixed a small bug which let custom http proxy fail to get correct port number. 2. Make HA Server as default proxy server. Previous Update: Implemented new ways to access setting pages and refresh.
ming900518 · Jan 8, 2021 · ea649f1 · ea649f1
1 parent 5220b6f
commit ea649f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/KanColleCommand.xcodeproj/project.pbxproj b/KanColleCommand.xcodeproj/project.pbxproj
@@ -979,7 +979,7 @@
 				INFOPLIST_FILE = KanColleCommand/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = "1.0 (TW.CHT-R2.6.1Beta2)";
+				MARKETING_VERSION = "1.0 (TW.CHT-R2.6.1Beta3)";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = tw.mingchang.ikancollecmd;
 				PRODUCT_NAME = iKanColleCmd;
@@ -1014,7 +1014,7 @@
 				INFOPLIST_FILE = KanColleCommand/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = "1.0 (TW.CHT-R2.6.1Beta2)";
+				MARKETING_VERSION = "1.0 (TW.CHT-R2.6.1Beta3)";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = tw.mingchang.ikancollecmd;
 				PRODUCT_NAME = iKanColleCmd;

diff --git a/KanColleCommand.xcworkspace/xcuserdata/mingchang.xcuserdatad/UserInterfaceState.xcuserstate b/KanColleCommand.xcworkspace/xcuserdata/mingchang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/KanColleCommand/Page/SettingVC.swift b/KanColleCommand/Page/SettingVC.swift
@@ -207,7 +207,7 @@ extension SettingVC: UITableViewDelegate {
                     })
                     HTTPproxyInfo.addAction(UIAlertAction(title: "完成", style: .default) { action in
                         Setting.saveCustomProxyIP(value: HTTPproxyInfo.textFields?[0].text ?? "")
-                        Setting.saveCustomProxyPort(value: HTTPproxyInfo.textFields?[0].text ?? "")
+                        Setting.saveCustomProxyPort(value: HTTPproxyInfo.textFields?[1].text ?? "")
                         Setting.saveCustomProxyUser(value: HTTPproxyInfo.textFields?[2].text ?? "")
                         Setting.saveCustomProxyPass(value: HTTPproxyInfo.textFields?[3].text ?? "")
                         self.present(HTTPcookieNeeded, animated: true)

diff --git a/KanColleCommand/WebView/WebHandler.swift b/KanColleCommand/WebView/WebHandler.swift
@@ -161,8 +161,8 @@ class WebHandler: URLProtocol, URLSessionDelegate, URLSessionDataDelegate, URLSe
 
         if Setting.getconnection() == 2 {
             print("[INFO] Using proxy to load response.")
-            let proxy_server = "non.http.monitor.moe"
-            let proxy_port = 8989
+            let proxy_server = "connector.monitor.moe"
+            let proxy_port = 8443
             let proxy_user = "ooi.moe"
             let proxy_pass = "ooi.moe"
             let hostKey = kCFNetworkProxiesHTTPProxy as String
@@ -180,7 +180,7 @@ class WebHandler: URLProtocol, URLSessionDelegate, URLSessionDataDelegate, URLSe
             print(proxy_server)
             let port:Int? = Int(Setting.getCustomProxyPort())
             let proxy_port = port
-            print(proxy_port ?? "80")
+            print(proxy_port ?? "Empty, using 80 instead.")
             let proxy_user = Setting.getCustomProxyUser()
             print(proxy_user)
             let proxy_pass = Setting.getCustomProxyPass()
@@ -199,7 +199,7 @@ class WebHandler: URLProtocol, URLSessionDelegate, URLSessionDataDelegate, URLSe
             let proxy_server = Setting.getCustomProxyIP()
             let port:Int? = Int(Setting.getCustomProxyPort())
             let proxy_port = port
-            print(proxy_port ?? "443")
+            print(proxy_port ?? "Empty, using 443 instead.")
             let proxy_user = Setting.getCustomProxyUser()
             let proxy_pass = Setting.getCustomProxyPass()
             let hostKey = kCFNetworkProxiesHTTPProxy as String