ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add webapp test

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-07-17 16:20:39 +04:00
parent ad35281263
commit ff306b0f89
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
submodules/ChatPresentationInterfaceState/Sources/ChatPanelInterfaceInteraction.swift
View File

@ -65,7 +65,6 @@ public enum ChatOpenWebViewSource: Equatable {
case generic case generic
case menu case menu
case inline(bot: EnginePeer) case inline(bot: EnginePeer)
case webApp(botApp: BotApp)
} }
public final class ChatPanelInterfaceInteraction { public final class ChatPanelInterfaceInteraction {

2
submodules/TelegramUI/Sources/Chat/ChatControllerOpenWebApp.swift
View File

@ -346,8 +346,6 @@ public extension ChatControllerImpl {
} }
self.attachmentController?.dismiss(animated: true, completion: nil) self.attachmentController?.dismiss(animated: true, completion: nil)
let openBotApp: (Bool, Bool) -> Void = { [weak self] allowWrite, justInstalled in let openBotApp: (Bool, Bool) -> Void = { [weak self] allowWrite, justInstalled in
guard let strongSelf = self else { guard let strongSelf = self else {
return return

16
submodules/WebUI/Sources/WebAppController.swift
View File

@ -326,12 +326,15 @@ public final class WebAppController: ViewController, AttachmentContainable {
guard let controller = self.controller else { guard let controller = self.controller else {
return return
} }
if let url = controller.url, controller.source != .menu { if let url = controller.url, controller.source != .menu {
self.queryId = controller.queryId self.queryId = controller.queryId
if let parsedUrl = URL(string: url) { if let parsedUrl = URL(string: url) {
self.webView?.load(URLRequest(url: parsedUrl)) self.webView?.load(URLRequest(url: parsedUrl))
} }
self.checkBotIdAndUrl(url)
if let keepAliveSignal = controller.keepAliveSignal { if let keepAliveSignal = controller.keepAliveSignal {
self.keepAliveDisposable = (keepAliveSignal self.keepAliveDisposable = (keepAliveSignal
|> deliverOnMainQueue).start(error: { [weak self] _ in |> deliverOnMainQueue).start(error: { [weak self] _ in
@ -351,6 +354,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
guard let strongSelf = self else { guard let strongSelf = self else {
return return
} }
strongSelf.checkBotIdAndUrl(result.url)
if let parsedUrl = URL(string: result.url) { if let parsedUrl = URL(string: result.url) {
strongSelf.queryId = result.queryId strongSelf.queryId = result.queryId
strongSelf.webView?.load(URLRequest(url: parsedUrl)) strongSelf.webView?.load(URLRequest(url: parsedUrl))
@ -372,6 +376,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
guard let self, let parsedUrl = URL(string: result.url) else { guard let self, let parsedUrl = URL(string: result.url) else {
return return
} }
self.checkBotIdAndUrl(result.url)
self.controller?.titleView?.title = WebAppTitle(title: appStart.botApp.title, counter: self.presentationData.strings.WebApp_Miniapp, isVerified: controller.botVerified) self.controller?.titleView?.title = WebAppTitle(title: appStart.botApp.title, counter: self.presentationData.strings.WebApp_Miniapp, isVerified: controller.botVerified)
self.webView?.load(URLRequest(url: parsedUrl)) self.webView?.load(URLRequest(url: parsedUrl))
}) })
@ -385,6 +390,8 @@ public final class WebAppController: ViewController, AttachmentContainable {
strongSelf.queryId = result.queryId strongSelf.queryId = result.queryId
strongSelf.webView?.load(URLRequest(url: parsedUrl)) strongSelf.webView?.load(URLRequest(url: parsedUrl))
strongSelf.checkBotIdAndUrl(result.url)
if let keepAliveSignal = result.keepAliveSignal { if let keepAliveSignal = result.keepAliveSignal {
strongSelf.keepAliveDisposable = (keepAliveSignal strongSelf.keepAliveDisposable = (keepAliveSignal
|> deliverOnMainQueue).start(error: { [weak self] _ in |> deliverOnMainQueue).start(error: { [weak self] _ in
@ -404,6 +411,15 @@ public final class WebAppController: ViewController, AttachmentContainable {
} }
} }
func checkBotIdAndUrl(_ url: String) {
//1985737506
if url.hasPrefix("https://walletbot.me"), let botId = self.controller?.botId.id._internalGetInt64Value(), botId != 1985737506 {
let alertController = textAlertController(context: self.context, updatedPresentationData: self.controller?.updatedPresentationData, title: nil, text: "Bot id mismatch, please report steps to app developer", actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: {
})])
self.controller?.present(alertController, in: .window(.root))
}
}
@objc fileprivate func mainButtonPressed() { @objc fileprivate func mainButtonPressed() {
if let mainButtonState = self.mainButtonState, !mainButtonState.isVisible || !mainButtonState.isEnabled { if let mainButtonState = self.mainButtonState, !mainButtonState.isVisible || !mainButtonState.isEnabled {
return return