Skip to content

Commit

Permalink
Build invitation QR-code instead of just replacing characters (#2134)
Browse files Browse the repository at this point in the history
  • Loading branch information
zeitschlag committed Sep 4, 2024
1 parent 43372ab commit 2f7f444
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions deltachat-ios/Helper/Utils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,22 @@ struct Utils {
}

public static func makeDeltaChatInvitationQRCode(from url: URL) -> String? {
guard url.isDeltaChatInvitation else { return nil }
guard url.isDeltaChatInvitation,
let components = URLComponents(url: url, resolvingAgainstBaseURL: true),
let fragment = components.fragment else { return nil }

let fragments = fragment.split(separator: "&")

var urlString = url.absoluteString
guard let fingerprint = fragments.first else { return nil }

guard let prefixRange = urlString.range(of: "https://\(inviteDomain)/#") else { return nil }
var qrcodeString = "OPENPGP4FPR:"
qrcodeString.append(String(fingerprint))
qrcodeString.append("#")

urlString.replaceSubrange(prefixRange, with: "OPENPGP4FPR:")
guard let firstAmpersandIndex = urlString.firstIndex(of: "&") else { return nil }
let plusOne = urlString.index(after: firstAmpersandIndex)
let ampersandRange = firstAmpersandIndex..<plusOne
urlString.replaceSubrange(ampersandRange, with: "#")
let queryParams = fragments.dropFirst().joined(separator: "&")
qrcodeString.append(queryParams)

return urlString
return qrcodeString
}

public static func getInviteLink(context: DcContext, chatId: Int) -> String? {
Expand Down

0 comments on commit 2f7f444

Please sign in to comment.