mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-10-15 19:50:30 +00:00
Narasimha-sc
992f7f9781
When a scanner is shown a QR code of a different kind than it expects, it now tells the user what they actually scanned and where to use it, instead of a generic "invalid" message. Link recognition is done in the core: a new chat_check_link export classifies a scanned string using the same decoders the views use to process the links (connection link, server address, migration file link, desktop address, security code), returning a typed result. Each scanner calls checkLink first; the expected type proceeds to that scanner's normal success path, a recognised-but-wrong type shows a shared wrong-type alert saying what it is and where to use it, and an unrecognised string falls back to that scanner's own contextual error. Mirrored on Android, desktop and iOS. Note: the iOS Swift was written without an Xcode toolchain and is not yet compiled — needs a Mac/CI build to verify.
71 lines
2.5 KiB
Swift
71 lines
2.5 KiB
Swift
//
|
|
// ScanProtocolServer.swift
|
|
// SimpleX (iOS)
|
|
//
|
|
// Created by Evgeny on 19/11/2022.
|
|
// Copyright © 2022 SimpleX Chat. All rights reserved.
|
|
//
|
|
// Spec: spec/architecture.md
|
|
|
|
import SwiftUI
|
|
import SimpleXChat
|
|
import CodeScanner
|
|
|
|
struct ScanProtocolServer: View {
|
|
@Environment(\.dismiss) var dismiss: DismissAction
|
|
@Binding var userServers: [UserOperatorServers]
|
|
@Binding var serverErrors: [UserServersError]
|
|
@Binding var serverWarnings: [UserServersWarning]
|
|
@State private var scanAlert: SomeAlert?
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading) {
|
|
Text("Scan server QR code")
|
|
.font(.largeTitle)
|
|
.bold()
|
|
.padding(.vertical)
|
|
CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
|
|
.aspectRatio(1, contentMode: .fit)
|
|
.cornerRadius(12)
|
|
.padding(.top)
|
|
}
|
|
.padding()
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
|
.alert(item: $scanAlert) { $0.alert }
|
|
}
|
|
|
|
func processQRCode(_ resp: Result<ScanResult, ScanError>) {
|
|
switch resp {
|
|
case let .success(r):
|
|
let trimmed = r.string.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
switch checkLink(trimmed) {
|
|
case .server?:
|
|
var server: UserServer = .empty
|
|
server.server = trimmed
|
|
addServer(server, $userServers, $serverErrors, $serverWarnings, dismiss)
|
|
case nil:
|
|
// unrecognised: scanner-local alert (deliberate iOS change from the pre-PR dismiss-then-global flow)
|
|
scanAlert = SomeAlert(
|
|
alert: mkAlert(title: "Invalid server address!", message: "Check server address and try again."),
|
|
id: "invalidServerAddress"
|
|
)
|
|
case let type?:
|
|
scanAlert = SomeAlert(alert: wrongQRCodeAlert(wrongQRCodeMessage(type)), id: "wrongQRCode")
|
|
}
|
|
case let .failure(e):
|
|
logger.error("ScanProtocolServer.processQRCode QR code error: \(e.localizedDescription)")
|
|
dismiss()
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ScanProtocolServer_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
ScanProtocolServer(
|
|
userServers: Binding.constant([UserOperatorServers.sampleDataNilOperator]),
|
|
serverErrors: Binding.constant([]),
|
|
serverWarnings: Binding.constant([])
|
|
)
|
|
}
|
|
}
|