permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 18:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

PeerID 26/n: FingerprintView (#833)

Browse Source
This commit is contained in:
Islam
2025-10-19 14:36:06 +02:00
committed by GitHub
parent 435744a977
commit d4967ae9c3
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Views/ContentView.swift
+1 -1
View File
@@ -199,7 +199,7 @@ struct ContentView: View {
set: { _ in viewModel.showingFingerprintFor = nil } set: { _ in viewModel.showingFingerprintFor = nil }
)) { )) {
if let peerID = viewModel.showingFingerprintFor { if let peerID = viewModel.showingFingerprintFor {
FingerprintView(viewModel: viewModel, peerID: peerID.id) FingerprintView(viewModel: viewModel, peerID: peerID)
} }
} }
#if os(iOS) #if os(iOS)
bitchat/Views/FingerprintView.swift
+8 -9
View File
@@ -10,7 +10,7 @@ import SwiftUI
struct FingerprintView: View { struct FingerprintView: View {
@ObservedObject var viewModel: ChatViewModel @ObservedObject var viewModel: ChatViewModel
let peerID: String let peerID: PeerID
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
@@ -65,15 +65,15 @@ struct FingerprintView: View {
VStack(alignment: .leading, spacing: 16) { VStack(alignment: .leading, spacing: 16) {
// Prefer short mesh ID for session/encryption status // Prefer short mesh ID for session/encryption status
let statusPeerID: String = { let statusPeerID: PeerID = {
if peerID.count == 64, let short = viewModel.getShortIDForNoiseKey(peerID) { return short.id } if peerID.id.count == 64, let short = viewModel.getShortIDForNoiseKey(peerID.id) { return short }
return peerID return peerID
}() }()
// Resolve a friendly name // Resolve a friendly name
let peerNickname: String = { let peerNickname: String = {
if let p = viewModel.getPeer(byID: PeerID(str: statusPeerID)) { return p.displayName } if let p = viewModel.getPeer(byID: statusPeerID) { return p.displayName }
if let name = viewModel.meshService.peerNickname(peerID: PeerID(str: statusPeerID)) { return name } if let name = viewModel.meshService.peerNickname(peerID: statusPeerID) { return name }
if peerID.count == 64, let data = Data(hexString: peerID) { if let data = peerID.noiseKey {
if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: data), !fav.peerNickname.isEmpty { return fav.peerNickname } if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: data), !fav.peerNickname.isEmpty { return fav.peerNickname }
let fp = data.sha256Fingerprint() let fp = data.sha256Fingerprint()
if let social = viewModel.identityManager.getSocialIdentity(for: fp) { if let social = viewModel.identityManager.getSocialIdentity(for: fp) {
@@ -84,7 +84,7 @@ struct FingerprintView: View {
return Strings.unknownPeer() return Strings.unknownPeer()
}() }()
// Accurate encryption state based on short ID session // Accurate encryption state based on short ID session
let encryptionStatus = viewModel.getEncryptionStatus(for: PeerID(str: statusPeerID)) let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID)
HStack { HStack {
if let icon = encryptionStatus.icon { if let icon = encryptionStatus.icon {
@@ -115,7 +115,7 @@ struct FingerprintView: View {
.font(.bitchatSystem(size: 12, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 12, weight: .bold, design: .monospaced))
.foregroundColor(textColor.opacity(0.7)) .foregroundColor(textColor.opacity(0.7))
if let fingerprint = viewModel.getFingerprint(for: PeerID(str: statusPeerID)) { if let fingerprint = viewModel.getFingerprint(for: statusPeerID) {
Text(formatFingerprint(fingerprint)) Text(formatFingerprint(fingerprint))
.font(.bitchatSystem(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
@@ -176,7 +176,6 @@ struct FingerprintView: View {
// Verification status // Verification status
if encryptionStatus == .noiseSecured || encryptionStatus == .noiseVerified { if encryptionStatus == .noiseSecured || encryptionStatus == .noiseVerified {
let isVerified = encryptionStatus == .noiseVerified let isVerified = encryptionStatus == .noiseVerified
let peerID = PeerID(str: peerID)
VStack(spacing: 12) { VStack(spacing: 12) {
Text(isVerified ? Strings.verifiedBadge : Strings.notVerifiedBadge) Text(isVerified ? Strings.verifiedBadge : Strings.notVerifiedBadge)