From 7aa5b6116d1441bb13c7d109a96725f324b38aa8 Mon Sep 17 00:00:00 2001 From: Isaac <> Date: Thu, 18 Jul 2024 11:41:35 +0800 Subject: [PATCH 1/2] Rewrite response request urls --- .../BrowserUI/Sources/BrowserWebContent.swift | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/submodules/BrowserUI/Sources/BrowserWebContent.swift b/submodules/BrowserUI/Sources/BrowserWebContent.swift index e49c7fb54a..e229e63842 100644 --- a/submodules/BrowserUI/Sources/BrowserWebContent.swift +++ b/submodules/BrowserUI/Sources/BrowserWebContent.swift @@ -27,6 +27,8 @@ private final class TonSchemeHandler: NSObject, WKURLSchemeHandler { init(proxyServerHost: String, sourceTask: any WKURLSchemeTask) { self.sourceTask = sourceTask + let requestUrl = sourceTask.request.url + var mappedHost: String = "" if let host = sourceTask.request.url?.host { mappedHost = host @@ -52,7 +54,20 @@ private final class TonSchemeHandler: NSObject, WKURLSchemeHandler { sourceTask.didFailWithError(error) } else { if let response { - sourceTask.didReceive(response) + if let response = response as? HTTPURLResponse, let requestUrl { + if let updatedResponse = HTTPURLResponse( + url: requestUrl, + statusCode: response.statusCode, + httpVersion: "HTTP/1.1", + headerFields: response.allHeaderFields as? [String: String] ?? [:] + ) { + sourceTask.didReceive(updatedResponse) + } else { + sourceTask.didReceive(response) + } + } else { + sourceTask.didReceive(response) + } } if let data { sourceTask.didReceive(data) From 4dfb7f9d170c2a4b66191cd51b51004a694259e2 Mon Sep 17 00:00:00 2001 From: Isaac <> Date: Thu, 18 Jul 2024 11:41:43 +0800 Subject: [PATCH 2/2] Change email --- .../Sources/AuthorizationSequenceController.swift | 6 +++--- .../SettingsUI/Sources/ChangePhoneNumberController.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/submodules/AuthorizationUI/Sources/AuthorizationSequenceController.swift b/submodules/AuthorizationUI/Sources/AuthorizationSequenceController.swift index d0c288876a..cb4520a32f 100644 --- a/submodules/AuthorizationUI/Sources/AuthorizationSequenceController.swift +++ b/submodules/AuthorizationUI/Sources/AuthorizationSequenceController.swift @@ -239,7 +239,7 @@ public final class AuthorizationSequenceController: NavigationController, ASAuth let carrier = CTCarrier() let mnc = carrier.mobileNetworkCode ?? "none" - AuthorizationSequenceController.presentEmailComposeController(address: "login@stel.com", subject: strongSelf.presentationData.strings.Login_InvalidPhoneEmailSubject(formattedNumber).string, body: strongSelf.presentationData.strings.Login_InvalidPhoneEmailBody(formattedNumber, appVersion, systemVersion, locale, mnc).string, from: controller, presentationData: strongSelf.presentationData) + AuthorizationSequenceController.presentEmailComposeController(address: "recover@telegram.org", subject: strongSelf.presentationData.strings.Login_InvalidPhoneEmailSubject(formattedNumber).string, body: strongSelf.presentationData.strings.Login_InvalidPhoneEmailBody(formattedNumber, appVersion, systemVersion, locale, mnc).string, from: controller, presentationData: strongSelf.presentationData) })) case .phoneLimitExceeded: text = strongSelf.presentationData.strings.Login_PhoneFloodError @@ -265,7 +265,7 @@ public final class AuthorizationSequenceController: NavigationController, ASAuth let carrier = CTCarrier() let mnc = carrier.mobileNetworkCode ?? "none" - AuthorizationSequenceController.presentEmailComposeController(address: "login@stel.com", subject: strongSelf.presentationData.strings.Login_PhoneBannedEmailSubject(formattedNumber).string, body: strongSelf.presentationData.strings.Login_PhoneBannedEmailBody(formattedNumber, appVersion, systemVersion, locale, mnc).string, from: controller, presentationData: strongSelf.presentationData) + AuthorizationSequenceController.presentEmailComposeController(address: "recover@telegram.org", subject: strongSelf.presentationData.strings.Login_PhoneBannedEmailSubject(formattedNumber).string, body: strongSelf.presentationData.strings.Login_PhoneBannedEmailBody(formattedNumber, appVersion, systemVersion, locale, mnc).string, from: controller, presentationData: strongSelf.presentationData) })) case let .generic(info): text = strongSelf.presentationData.strings.Login_UnknownError @@ -287,7 +287,7 @@ public final class AuthorizationSequenceController: NavigationController, ASAuth errorString = "unknown" } - AuthorizationSequenceController.presentEmailComposeController(address: "login@stel.com", subject: strongSelf.presentationData.strings.Login_PhoneGenericEmailSubject(formattedNumber).string, body: strongSelf.presentationData.strings.Login_PhoneGenericEmailBody(formattedNumber, errorString, appVersion, systemVersion, locale, mnc).string, from: controller, presentationData: strongSelf.presentationData) + AuthorizationSequenceController.presentEmailComposeController(address: "recover@telegram.org", subject: strongSelf.presentationData.strings.Login_PhoneGenericEmailSubject(formattedNumber).string, body: strongSelf.presentationData.strings.Login_PhoneGenericEmailBody(formattedNumber, errorString, appVersion, systemVersion, locale, mnc).string, from: controller, presentationData: strongSelf.presentationData) })) case .timeout: text = strongSelf.presentationData.strings.Login_NetworkError diff --git a/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift b/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift index 12a535cc9d..f547f2390a 100644 --- a/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift +++ b/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift @@ -147,7 +147,7 @@ public func ChangePhoneNumberController(context: AccountContext) -> ViewControll if MFMailComposeViewController.canSendMail() { let composeController = MFMailComposeViewController() - composeController.setToRecipients(["login@stel.com"]) + composeController.setToRecipients(["recover@telegram.org"]) composeController.setSubject(presentationData.strings.Login_PhoneBannedEmailSubject(formattedNumber).string) composeController.setMessageBody(presentationData.strings.Login_PhoneBannedEmailBody(formattedNumber, appVersion, systemVersion, locale, mnc).string, isHTML: false) composeController.mailComposeDelegate = controller