diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f6de2444..7222b63d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -90,6 +90,15 @@ dependencies {
// Permissions
implementation(libs.accompanist.permissions)
+
+ // QR
+ implementation(libs.zxing.core)
+ implementation(libs.mlkit.barcode.scanning)
+
+ // CameraX
+ implementation(libs.androidx.camera.camera2)
+ implementation(libs.androidx.camera.lifecycle)
+ implementation(libs.androidx.camera.compose)
// Cryptography
implementation(libs.bundles.cryptography)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f4ca2b89..14a01098 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,6 +31,8 @@
+
+
@@ -47,6 +49,7 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/bitchat/android/MainActivity.kt b/app/src/main/java/com/bitchat/android/MainActivity.kt
index 717a24ed..a87c4a25 100644
--- a/app/src/main/java/com/bitchat/android/MainActivity.kt
+++ b/app/src/main/java/com/bitchat/android/MainActivity.kt
@@ -40,6 +40,7 @@ import com.bitchat.android.ui.ChatViewModel
import com.bitchat.android.ui.OrientationAwareActivity
import com.bitchat.android.ui.theme.BitchatTheme
import com.bitchat.android.nostr.PoWPreferenceManager
+import com.bitchat.android.services.VerificationService
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@@ -655,6 +656,7 @@ class MainActivity : OrientationAwareActivity() {
// Handle any notification intent
handleNotificationIntent(intent)
+ handleVerificationIntent(intent)
// Small delay to ensure mesh service is fully initialized
delay(500)
@@ -683,6 +685,7 @@ class MainActivity : OrientationAwareActivity() {
// Handle notification intents when app is already running
if (mainViewModel.onboardingState.value == OnboardingState.COMPLETE) {
handleNotificationIntent(intent)
+ handleVerificationIntent(intent)
}
}
@@ -788,6 +791,17 @@ class MainActivity : OrientationAwareActivity() {
}
}
+ private fun handleVerificationIntent(intent: Intent) {
+ val uri = intent.data ?: return
+ if (uri.scheme != "bitchat" || uri.host != "verify") return
+
+ chatViewModel.showVerificationSheet()
+ val qr = VerificationService.verifyScannedQR(uri.toString())
+ if (qr != null) {
+ chatViewModel.beginQRVerification(qr)
+ }
+ }
+
override fun onDestroy() {
super.onDestroy()
diff --git a/app/src/main/java/com/bitchat/android/identity/SecureIdentityStateManager.kt b/app/src/main/java/com/bitchat/android/identity/SecureIdentityStateManager.kt
index 2b0b2bdd..012ea3c4 100644
--- a/app/src/main/java/com/bitchat/android/identity/SecureIdentityStateManager.kt
+++ b/app/src/main/java/com/bitchat/android/identity/SecureIdentityStateManager.kt
@@ -5,7 +5,10 @@ import android.content.SharedPreferences
import androidx.security.crypto.EncryptedSharedPreferences
import androidx.security.crypto.MasterKey
import java.security.MessageDigest
+import android.util.Base64
import android.util.Log
+import com.bitchat.android.util.hexEncodedString
+import androidx.core.content.edit
/**
* Manages persistent identity storage and peer ID rotation - 100% compatible with iOS implementation
@@ -24,9 +27,15 @@ class SecureIdentityStateManager(private val context: Context) {
private const val KEY_STATIC_PUBLIC_KEY = "static_public_key"
private const val KEY_SIGNING_PRIVATE_KEY = "signing_private_key"
private const val KEY_SIGNING_PUBLIC_KEY = "signing_public_key"
+ private const val KEY_VERIFIED_FINGERPRINTS = "verified_fingerprints"
+ private const val KEY_CACHED_PEER_FINGERPRINTS = "cached_peer_fingerprints"
+ private const val KEY_CACHED_PEER_NOISE_KEYS = "cached_peer_noise_keys"
+ private const val KEY_CACHED_NOISE_FINGERPRINTS = "cached_noise_fingerprints"
+ private const val KEY_CACHED_FINGERPRINT_NICKNAMES = "cached_fingerprint_nicknames"
}
private val prefs: SharedPreferences
+ private val lock = Any()
init {
// Create master key for encryption
@@ -168,7 +177,7 @@ class SecureIdentityStateManager(private val context: Context) {
fun generateFingerprint(publicKeyData: ByteArray): String {
val digest = MessageDigest.getInstance("SHA-256")
val hash = digest.digest(publicKeyData)
- return hash.joinToString("") { "%02x".format(it) }
+ return hash.hexEncodedString()
}
/**
@@ -178,6 +187,112 @@ class SecureIdentityStateManager(private val context: Context) {
// SHA-256 fingerprint should be 64 hex characters
return fingerprint.matches(Regex("^[a-fA-F0-9]{64}$"))
}
+
+ // MARK: - Verified Fingerprints
+
+ fun getVerifiedFingerprints(): Set {
+ return prefs.getStringSet(KEY_VERIFIED_FINGERPRINTS, emptySet())?.toSet() ?: emptySet()
+ }
+
+ fun isVerifiedFingerprint(fingerprint: String): Boolean {
+ return getVerifiedFingerprints().contains(fingerprint)
+ }
+
+ fun setVerifiedFingerprint(fingerprint: String, verified: Boolean) {
+ if (!isValidFingerprint(fingerprint)) return
+ synchronized(lock) {
+ val current = prefs.getStringSet(KEY_VERIFIED_FINGERPRINTS, emptySet())?.toMutableSet() ?: mutableSetOf()
+ if (verified) {
+ current.add(fingerprint)
+ } else {
+ current.remove(fingerprint)
+ }
+ prefs.edit { putStringSet(KEY_VERIFIED_FINGERPRINTS, current) }
+ }
+ }
+
+ fun getCachedPeerFingerprint(peerID: String): String? {
+ val pid = peerID.lowercase()
+ // Reading is safe without lock for SharedPreferences, but synchronizing ensures memory visibility
+ // if we are paranoid, but SharedPreferences is generally thread-safe for reads.
+ // However, to ensure we don't read a partial update (unlikely with SP), we can leave it.
+ // The critical part is the write.
+ val entries = prefs.getStringSet(KEY_CACHED_PEER_FINGERPRINTS, emptySet()) ?: return null
+ val entry = entries.firstOrNull { it.startsWith("$pid:") } ?: return null
+ return entry.substringAfter(':').takeIf { isValidFingerprint(it) }
+ }
+
+ fun cachePeerFingerprint(peerID: String, fingerprint: String) {
+ if (!isValidFingerprint(fingerprint)) return
+ val pid = peerID.lowercase()
+ synchronized(lock) {
+ val current = prefs.getStringSet(KEY_CACHED_PEER_FINGERPRINTS, emptySet())?.toMutableSet() ?: mutableSetOf()
+ current.removeAll { it.startsWith("$pid:") }
+ current.add("$pid:$fingerprint")
+ prefs.edit { putStringSet(KEY_CACHED_PEER_FINGERPRINTS, current) }
+ }
+ }
+
+ fun getCachedNoiseKey(peerID: String): String? {
+ val pid = peerID.lowercase()
+ val entries = prefs.getStringSet(KEY_CACHED_PEER_NOISE_KEYS, emptySet()) ?: return null
+ val entry = entries.firstOrNull { it.startsWith("$pid=") } ?: return null
+ return entry.substringAfter('=').takeIf { it.matches(Regex("^[a-fA-F0-9]{64}$")) }
+ }
+
+ fun cachePeerNoiseKey(peerID: String, noiseKeyHex: String) {
+ if (!noiseKeyHex.matches(Regex("^[a-fA-F0-9]{64}$"))) return
+ val pid = peerID.lowercase()
+ synchronized(lock) {
+ val current = prefs.getStringSet(KEY_CACHED_PEER_NOISE_KEYS, emptySet())?.toMutableSet() ?: mutableSetOf()
+ current.removeAll { it.startsWith("$pid=") }
+ current.add("$pid=${noiseKeyHex.lowercase()}")
+ prefs.edit { putStringSet(KEY_CACHED_PEER_NOISE_KEYS, current) }
+ }
+ }
+
+ fun getCachedNoiseFingerprint(noiseKeyHex: String): String? {
+ val key = noiseKeyHex.lowercase()
+ val entries = prefs.getStringSet(KEY_CACHED_NOISE_FINGERPRINTS, emptySet()) ?: return null
+ val entry = entries.firstOrNull { it.startsWith("$key=") } ?: return null
+ return entry.substringAfter('=').takeIf { isValidFingerprint(it) }
+ }
+
+ fun cacheNoiseFingerprint(noiseKeyHex: String, fingerprint: String) {
+ if (!isValidFingerprint(fingerprint)) return
+ if (!noiseKeyHex.matches(Regex("^[a-fA-F0-9]{64}$"))) return
+ val key = noiseKeyHex.lowercase()
+ synchronized(lock) {
+ val current = prefs.getStringSet(KEY_CACHED_NOISE_FINGERPRINTS, emptySet())?.toMutableSet() ?: mutableSetOf()
+ current.removeAll { it.startsWith("$key=") }
+ current.add("$key=$fingerprint")
+ prefs.edit { putStringSet(KEY_CACHED_NOISE_FINGERPRINTS, current) }
+ }
+ }
+
+ fun getCachedFingerprintNickname(fingerprint: String): String? {
+ if (!isValidFingerprint(fingerprint)) return null
+ val key = fingerprint.lowercase()
+ val entries = prefs.getStringSet(KEY_CACHED_FINGERPRINT_NICKNAMES, emptySet()) ?: return null
+ val entry = entries.firstOrNull { it.startsWith("$key=") } ?: return null
+ val encoded = entry.substringAfter('=')
+ return runCatching {
+ val bytes = Base64.decode(encoded, Base64.NO_WRAP)
+ String(bytes, Charsets.UTF_8)
+ }.getOrNull()
+ }
+
+ fun cacheFingerprintNickname(fingerprint: String, nickname: String) {
+ if (!isValidFingerprint(fingerprint)) return
+ val key = fingerprint.lowercase()
+ val encoded = Base64.encodeToString(nickname.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
+ synchronized(lock) {
+ val current = prefs.getStringSet(KEY_CACHED_FINGERPRINT_NICKNAMES, emptySet())?.toMutableSet() ?: mutableSetOf()
+ current.removeAll { it.startsWith("$key=") }
+ current.add("$key=$encoded")
+ prefs.edit { putStringSet(KEY_CACHED_FINGERPRINT_NICKNAMES, current) }
+ }
+ }
// MARK: - Peer ID Rotation Management (removed)
// Android now derives peer ID from the persisted Noise identity fingerprint.
diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
index 3de48407..91f88919 100644
--- a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
+++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
@@ -7,12 +7,15 @@ import com.bitchat.android.model.BitchatMessage
import com.bitchat.android.protocol.MessagePadding
import com.bitchat.android.model.RoutedPacket
import com.bitchat.android.model.IdentityAnnouncement
+import com.bitchat.android.model.NoisePayload
+import com.bitchat.android.model.NoisePayloadType
import com.bitchat.android.protocol.BitchatPacket
import com.bitchat.android.protocol.MessageType
import com.bitchat.android.protocol.SpecialRecipients
import com.bitchat.android.model.RequestSyncPacket
import com.bitchat.android.sync.GossipSyncManager
import com.bitchat.android.util.toHexString
+import com.bitchat.android.services.VerificationService
import kotlinx.coroutines.*
import java.util.*
import kotlin.math.sign
@@ -72,6 +75,7 @@ class BluetoothMeshService(private val context: Context) {
init {
Log.i(TAG, "Initializing BluetoothMeshService for peer=$myPeerID")
+ VerificationService.configure(encryptionService)
setupDelegates()
messageHandler.packetProcessor = packetProcessor
//startPeriodicDebugLogging()
@@ -414,6 +418,14 @@ class BluetoothMeshService(private val context: Context) {
override fun onReadReceiptReceived(messageID: String, peerID: String) {
delegate?.didReceiveReadReceipt(messageID, peerID)
}
+
+ override fun onVerifyChallengeReceived(peerID: String, payload: ByteArray, timestampMs: Long) {
+ delegate?.didReceiveVerifyChallenge(peerID, payload, timestampMs)
+ }
+
+ override fun onVerifyResponseReceived(peerID: String, payload: ByteArray, timestampMs: Long) {
+ delegate?.didReceiveVerifyResponse(peerID, payload, timestampMs)
+ }
}
// PacketProcessor delegates
@@ -939,6 +951,50 @@ class BluetoothMeshService(private val context: Context) {
}
}
}
+
+ // MARK: QR Verification over Noise
+
+ fun sendVerifyChallenge(peerID: String, noiseKeyHex: String, nonceA: ByteArray) {
+ val tlv = VerificationService.buildVerifyChallenge(noiseKeyHex, nonceA)
+ val payload = NoisePayload(
+ type = NoisePayloadType.VERIFY_CHALLENGE,
+ data = tlv
+ )
+ sendNoisePayloadToPeer(payload, peerID, "verify challenge")
+ }
+
+ fun sendVerifyResponse(peerID: String, noiseKeyHex: String, nonceA: ByteArray) {
+ val tlv = VerificationService.buildVerifyResponse(noiseKeyHex, nonceA) ?: return
+ val payload = NoisePayload(
+ type = NoisePayloadType.VERIFY_RESPONSE,
+ data = tlv
+ )
+ sendNoisePayloadToPeer(payload, peerID, "verify response")
+ }
+
+ private fun sendNoisePayloadToPeer(payload: NoisePayload, recipientPeerID: String, label: String) {
+ serviceScope.launch {
+ try {
+ val encrypted = encryptionService.encrypt(payload.encode(), recipientPeerID)
+ val packet = BitchatPacket(
+ version = 1u,
+ type = MessageType.NOISE_ENCRYPTED.value,
+ senderID = hexStringToByteArray(myPeerID),
+ recipientID = hexStringToByteArray(recipientPeerID),
+ timestamp = System.currentTimeMillis().toULong(),
+ payload = encrypted,
+ signature = null,
+ ttl = com.bitchat.android.util.AppConstants.MESSAGE_TTL_HOPS
+ )
+
+ val signedPacket = signPacketBeforeBroadcast(packet)
+ connectionManager.broadcastPacket(RoutedPacket(signedPacket))
+ Log.d(TAG, "📤 Sent $label to $recipientPeerID (${payload.data.size} bytes)")
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to send $label to $recipientPeerID: ${e.message}")
+ }
+ }
+ }
/**
* Send broadcast announce with TLV-encoded identity announcement - exactly like iOS
@@ -1127,6 +1183,10 @@ class BluetoothMeshService(private val context: Context) {
fun getIdentityFingerprint(): String {
return encryptionService.getIdentityFingerprint()
}
+
+ fun getStaticNoisePublicKey(): ByteArray? {
+ return encryptionService.getStaticPublicKey()
+ }
/**
* Check if encryption icon should be shown for a peer
@@ -1283,6 +1343,8 @@ interface BluetoothMeshDelegate {
fun didReceiveChannelLeave(channel: String, fromPeer: String)
fun didReceiveDeliveryAck(messageID: String, recipientPeerID: String)
fun didReceiveReadReceipt(messageID: String, recipientPeerID: String)
+ fun didReceiveVerifyChallenge(peerID: String, payload: ByteArray, timestampMs: Long)
+ fun didReceiveVerifyResponse(peerID: String, payload: ByteArray, timestampMs: Long)
fun decryptChannelMessage(encryptedContent: ByteArray, channel: String): String?
fun getNickname(): String?
fun isFavorite(peerID: String): Boolean
diff --git a/app/src/main/java/com/bitchat/android/mesh/MessageHandler.kt b/app/src/main/java/com/bitchat/android/mesh/MessageHandler.kt
index d016dd37..ce8b0d9e 100644
--- a/app/src/main/java/com/bitchat/android/mesh/MessageHandler.kt
+++ b/app/src/main/java/com/bitchat/android/mesh/MessageHandler.kt
@@ -157,6 +157,14 @@ class MessageHandler(private val myPeerID: String, private val appContext: andro
// Simplified: Call delegate with messageID and peerID directly
delegate?.onReadReceiptReceived(messageID, peerID)
}
+ com.bitchat.android.model.NoisePayloadType.VERIFY_CHALLENGE -> {
+ Log.d(TAG, "🔐 Verify challenge received from $peerID (${noisePayload.data.size} bytes)")
+ delegate?.onVerifyChallengeReceived(peerID, noisePayload.data, packet.timestamp.toLong())
+ }
+ com.bitchat.android.model.NoisePayloadType.VERIFY_RESPONSE -> {
+ Log.d(TAG, "🔐 Verify response received from $peerID (${noisePayload.data.size} bytes)")
+ delegate?.onVerifyResponseReceived(peerID, noisePayload.data, packet.timestamp.toLong())
+ }
}
} catch (e: Exception) {
@@ -611,4 +619,6 @@ interface MessageHandlerDelegate {
fun onChannelLeave(channel: String, fromPeer: String)
fun onDeliveryAckReceived(messageID: String, peerID: String)
fun onReadReceiptReceived(messageID: String, peerID: String)
+ fun onVerifyChallengeReceived(peerID: String, payload: ByteArray, timestampMs: Long)
+ fun onVerifyResponseReceived(peerID: String, payload: ByteArray, timestampMs: Long)
}
diff --git a/app/src/main/java/com/bitchat/android/model/NoiseEncrypted.kt b/app/src/main/java/com/bitchat/android/model/NoiseEncrypted.kt
index 7f691a9c..c46a114f 100644
--- a/app/src/main/java/com/bitchat/android/model/NoiseEncrypted.kt
+++ b/app/src/main/java/com/bitchat/android/model/NoiseEncrypted.kt
@@ -21,6 +21,8 @@ enum class NoisePayloadType(val value: UByte) {
PRIVATE_MESSAGE(0x01u), // Private chat message with TLV encoding
READ_RECEIPT(0x02u), // Message was read
DELIVERED(0x03u), // Message was delivered
+ VERIFY_CHALLENGE(0x10u), // Verification challenge
+ VERIFY_RESPONSE(0x11u), // Verification response
FILE_TRANSFER(0x20u);
diff --git a/app/src/main/java/com/bitchat/android/nostr/NostrDirectMessageHandler.kt b/app/src/main/java/com/bitchat/android/nostr/NostrDirectMessageHandler.kt
index 3dcb60d6..18c12e4d 100644
--- a/app/src/main/java/com/bitchat/android/nostr/NostrDirectMessageHandler.kt
+++ b/app/src/main/java/com/bitchat/android/nostr/NostrDirectMessageHandler.kt
@@ -2,8 +2,12 @@ package com.bitchat.android.nostr
import android.app.Application
import android.util.Log
+import com.bitchat.android.model.BitchatFilePacket
import com.bitchat.android.model.BitchatMessage
import com.bitchat.android.model.DeliveryStatus
+import com.bitchat.android.model.NoisePayload
+import com.bitchat.android.model.NoisePayloadType
+import com.bitchat.android.model.PrivateMessagePacket
import com.bitchat.android.protocol.BitchatPacket
import com.bitchat.android.services.SeenMessageStore
import com.bitchat.android.ui.ChatState
@@ -71,7 +75,7 @@ class NostrDirectMessageHandler(
if (packet.type != com.bitchat.android.protocol.MessageType.NOISE_ENCRYPTED.value) return@launch
- val noisePayload = com.bitchat.android.model.NoisePayload.decode(packet.payload) ?: return@launch
+ val noisePayload = NoisePayload.decode(packet.payload) ?: return@launch
val messageTimestamp = Date(giftWrap.createdAt * 1000L)
val convKey = "nostr_${senderPubkey.take(16)}"
repo.putNostrKeyMapping(convKey, senderPubkey)
@@ -104,7 +108,7 @@ class NostrDirectMessageHandler(
}
private suspend fun processNoisePayload(
- payload: com.bitchat.android.model.NoisePayload,
+ payload: NoisePayload,
convKey: String,
senderNickname: String,
timestamp: Date,
@@ -112,8 +116,8 @@ class NostrDirectMessageHandler(
recipientIdentity: NostrIdentity
) {
when (payload.type) {
- com.bitchat.android.model.NoisePayloadType.PRIVATE_MESSAGE -> {
- val pm = com.bitchat.android.model.PrivateMessagePacket.decode(payload.data) ?: return
+ NoisePayloadType.PRIVATE_MESSAGE -> {
+ val pm = PrivateMessagePacket.decode(payload.data) ?: return
val existingMessages = state.getPrivateChatsValue()[convKey] ?: emptyList()
if (existingMessages.any { it.id == pm.messageID }) return
@@ -148,21 +152,21 @@ class NostrDirectMessageHandler(
seenStore.markRead(pm.messageID)
}
}
- com.bitchat.android.model.NoisePayloadType.DELIVERED -> {
+ NoisePayloadType.DELIVERED -> {
val messageId = String(payload.data, Charsets.UTF_8)
withContext(Dispatchers.Main) {
meshDelegateHandler.didReceiveDeliveryAck(messageId, convKey)
}
}
- com.bitchat.android.model.NoisePayloadType.READ_RECEIPT -> {
+ NoisePayloadType.READ_RECEIPT -> {
val messageId = String(payload.data, Charsets.UTF_8)
withContext(Dispatchers.Main) {
meshDelegateHandler.didReceiveReadReceipt(messageId, convKey)
}
}
- com.bitchat.android.model.NoisePayloadType.FILE_TRANSFER -> {
+ NoisePayloadType.FILE_TRANSFER -> {
// Properly handle encrypted file transfer
- val file = com.bitchat.android.model.BitchatFilePacket.decode(payload.data)
+ val file = BitchatFilePacket.decode(payload.data)
if (file != null) {
val uniqueMsgId = java.util.UUID.randomUUID().toString().uppercase()
val savedPath = com.bitchat.android.features.file.FileUtils.saveIncomingFile(application, file)
@@ -185,6 +189,8 @@ class NostrDirectMessageHandler(
Log.w(TAG, "⚠️ Failed to decode Nostr file transfer from $convKey")
}
}
+ NoisePayloadType.VERIFY_CHALLENGE,
+ NoisePayloadType.VERIFY_RESPONSE -> Unit // Ignore verification payloads in Nostr direct messages
}
}
diff --git a/app/src/main/java/com/bitchat/android/services/VerificationService.kt b/app/src/main/java/com/bitchat/android/services/VerificationService.kt
new file mode 100644
index 00000000..06dcd6f3
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/services/VerificationService.kt
@@ -0,0 +1,294 @@
+package com.bitchat.android.services
+
+import android.net.Uri
+import android.util.Base64
+import com.bitchat.android.crypto.EncryptionService
+import com.bitchat.android.util.AppConstants
+import com.bitchat.android.util.dataFromHexString
+import com.bitchat.android.util.hexEncodedString
+import java.io.ByteArrayOutputStream
+import java.security.SecureRandom
+import androidx.core.net.toUri
+import java.lang.ref.WeakReference
+
+/**
+ * QR verification helpers: schema, signing, and basic challenge/response helpers.
+ */
+object VerificationService {
+ private const val CONTEXT = "bitchat-verify-v1"
+ private const val RESPONSE_CONTEXT = "bitchat-verify-resp-v1"
+
+ private var encryptionServiceRef: WeakReference? = null
+
+ fun configure(encryptionService: EncryptionService) {
+ this.encryptionServiceRef = WeakReference(encryptionService)
+ }
+
+ data class VerificationQR(
+ val v: Int,
+ val noiseKeyHex: String,
+ val signKeyHex: String,
+ val npub: String?,
+ val nickname: String,
+ val ts: Long,
+ val nonceB64: String,
+ val sigHex: String
+ ) {
+ fun canonicalBytes(): ByteArray {
+ val out = ByteArrayOutputStream()
+
+ fun appendField(value: String) {
+ val data = value.toByteArray(Charsets.UTF_8)
+ val len = minOf(data.size, 255)
+ out.write(len)
+ out.write(data, 0, len)
+ }
+
+ appendField(CONTEXT)
+ appendField(v.toString())
+ appendField(noiseKeyHex.lowercase())
+ appendField(signKeyHex.lowercase())
+ appendField(npub ?: "")
+ appendField(nickname)
+ appendField(ts.toString())
+ appendField(nonceB64)
+ return out.toByteArray()
+ }
+
+ fun toUrlString(): String {
+ val builder = Uri.Builder()
+ .scheme("bitchat")
+ .authority("verify")
+ .appendQueryParameter("v", v.toString())
+ .appendQueryParameter("noise", noiseKeyHex)
+ .appendQueryParameter("sign", signKeyHex)
+ .appendQueryParameter("nick", nickname)
+ .appendQueryParameter("ts", ts.toString())
+ .appendQueryParameter("nonce", nonceB64)
+ .appendQueryParameter("sig", sigHex)
+ if (npub != null) {
+ builder.appendQueryParameter("npub", npub)
+ }
+ return builder.build().toString()
+ }
+
+ companion object {
+ fun fromUrlString(urlString: String): VerificationQR? {
+ val uri = runCatching { urlString.toUri() }.getOrNull() ?: return null
+ if (uri.scheme != "bitchat" || uri.host != "verify") return null
+
+ val vStr = uri.getQueryParameter("v") ?: return null
+ val v = vStr.toIntOrNull() ?: return null
+ val noise = uri.getQueryParameter("noise") ?: return null
+ val sign = uri.getQueryParameter("sign") ?: return null
+ val nick = uri.getQueryParameter("nick") ?: return null
+ val tsStr = uri.getQueryParameter("ts") ?: return null
+ val ts = tsStr.toLongOrNull() ?: return null
+ val nonce = uri.getQueryParameter("nonce") ?: return null
+ val sig = uri.getQueryParameter("sig") ?: return null
+ val npub = uri.getQueryParameter("npub")
+
+ return VerificationQR(
+ v = v,
+ noiseKeyHex = noise,
+ signKeyHex = sign,
+ npub = npub,
+ nickname = nick,
+ ts = ts,
+ nonceB64 = nonce,
+ sigHex = sig
+ )
+ }
+ }
+ }
+
+ fun buildMyQRString(nickname: String, npub: String?): String? {
+ val service = encryptionServiceRef?.get() ?: return null
+ val cache = Cache.last
+ if (cache != null && cache.nickname == nickname && cache.npub == npub) {
+ if (System.currentTimeMillis() - cache.builtAtMs < 60_000L) {
+ return cache.value
+ }
+ }
+
+ val noiseKey = service.getStaticPublicKey()?.hexEncodedString() ?: return null
+ val signKey = service.getSigningPublicKey()?.hexEncodedString() ?: return null
+ val ts = System.currentTimeMillis() / 1000L
+ val nonce = ByteArray(16)
+ SecureRandom().nextBytes(nonce)
+ val nonceB64 = Base64.encodeToString(
+ nonce,
+ Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING
+ )
+
+ val payload = VerificationQR(
+ v = 1,
+ noiseKeyHex = noiseKey,
+ signKeyHex = signKey,
+ npub = npub,
+ nickname = nickname,
+ ts = ts,
+ nonceB64 = nonceB64,
+ sigHex = ""
+ )
+
+ val signature = service.signData(payload.canonicalBytes()) ?: return null
+ val signed = payload.copy(sigHex = signature.hexEncodedString())
+ val out = signed.toUrlString()
+ Cache.last = CacheEntry(nickname, npub, System.currentTimeMillis(), out)
+ return out
+ }
+
+ fun verifyScannedQR(
+ urlString: String,
+ maxAgeSeconds: Long = AppConstants.Verification.QR_MAX_AGE_SECONDS
+ ): VerificationQR? {
+ val service = encryptionServiceRef?.get() ?: return null
+ val qr = VerificationQR.fromUrlString(urlString) ?: return null
+ val now = System.currentTimeMillis() / 1000L
+ if (now - qr.ts > maxAgeSeconds) return null
+
+ val sig = qr.sigHex.dataFromHexString() ?: return null
+ val signKey = qr.signKeyHex.dataFromHexString() ?: return null
+ val ok = service.verifyEd25519Signature(sig, qr.canonicalBytes(), signKey)
+ return if (ok) qr else null
+ }
+
+ fun buildVerifyChallenge(noiseKeyHex: String, nonceA: ByteArray): ByteArray {
+ val noiseData = noiseKeyHex.toByteArray(Charsets.UTF_8)
+ val out = ByteArrayOutputStream()
+ out.write(0x01)
+ out.write(minOf(noiseData.size, 255))
+ out.write(noiseData, 0, minOf(noiseData.size, 255))
+ out.write(0x02)
+ out.write(minOf(nonceA.size, 255))
+ out.write(nonceA, 0, minOf(nonceA.size, 255))
+ return out.toByteArray()
+ }
+
+ fun buildVerifyResponse(noiseKeyHex: String, nonceA: ByteArray): ByteArray? {
+ val service = encryptionServiceRef?.get() ?: return null
+ val noiseData = noiseKeyHex.toByteArray(Charsets.UTF_8)
+ val msg = ByteArrayOutputStream()
+ msg.write(RESPONSE_CONTEXT.toByteArray(Charsets.UTF_8))
+ msg.write(minOf(noiseData.size, 255))
+ msg.write(noiseData, 0, minOf(noiseData.size, 255))
+ msg.write(nonceA)
+ val sig = service.signData(msg.toByteArray()) ?: return null
+
+ val out = ByteArrayOutputStream()
+ out.write(0x01)
+ out.write(minOf(noiseData.size, 255))
+ out.write(noiseData, 0, minOf(noiseData.size, 255))
+ out.write(0x02)
+ out.write(minOf(nonceA.size, 255))
+ out.write(nonceA, 0, minOf(nonceA.size, 255))
+ out.write(0x03)
+ out.write(minOf(sig.size, 255))
+ out.write(sig, 0, minOf(sig.size, 255))
+ return out.toByteArray()
+ }
+
+ fun parseVerifyChallenge(data: ByteArray): Pair? {
+ var idx = 0
+
+ fun take(n: Int): ByteArray? {
+ if (idx + n > data.size) return null
+ val out = data.copyOfRange(idx, idx + n)
+ idx += n
+ return out
+ }
+
+ val t1 = take(1) ?: return null
+ if (t1[0].toInt() != 0x01) return null
+ val l1 = take(1)?.get(0)?.toInt() ?: return null
+ val noiseBytes = take(l1) ?: return null
+ val noise = noiseBytes.toString(Charsets.UTF_8)
+
+ val t2 = take(1) ?: return null
+ if (t2[0].toInt() != 0x02) return null
+ val l2 = take(1)?.get(0)?.toInt() ?: return null
+ val nonce = take(l2) ?: return null
+
+ return noise to nonce
+ }
+
+ data class VerifyResponse(val noiseKeyHex: String, val nonceA: ByteArray, val signature: ByteArray) {
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as VerifyResponse
+
+ if (noiseKeyHex != other.noiseKeyHex) return false
+ if (!nonceA.contentEquals(other.nonceA)) return false
+ if (!signature.contentEquals(other.signature)) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = noiseKeyHex.hashCode()
+ result = 31 * result + nonceA.contentHashCode()
+ result = 31 * result + signature.contentHashCode()
+ return result
+ }
+ }
+
+ fun parseVerifyResponse(data: ByteArray): VerifyResponse? {
+ var idx = 0
+
+ fun take(n: Int): ByteArray? {
+ if (idx + n > data.size) return null
+ val out = data.copyOfRange(idx, idx + n)
+ idx += n
+ return out
+ }
+
+ val t1 = take(1) ?: return null
+ if (t1[0].toInt() != 0x01) return null
+ val l1 = take(1)?.get(0)?.toInt() ?: return null
+ val noiseBytes = take(l1) ?: return null
+ val noise = noiseBytes.toString(Charsets.UTF_8)
+
+ val t2 = take(1) ?: return null
+ if (t2[0].toInt() != 0x02) return null
+ val l2 = take(1)?.get(0)?.toInt() ?: return null
+ val nonce = take(l2) ?: return null
+
+ val t3 = take(1) ?: return null
+ if (t3[0].toInt() != 0x03) return null
+ val l3 = take(1)?.get(0)?.toInt() ?: return null
+ val sig = take(l3) ?: return null
+
+ return VerifyResponse(noise, nonce, sig)
+ }
+
+ fun verifyResponseSignature(
+ noiseKeyHex: String,
+ nonceA: ByteArray,
+ signature: ByteArray,
+ signerPublicKeyHex: String
+ ): Boolean {
+ val service = encryptionServiceRef?.get() ?: return false
+ val noiseData = noiseKeyHex.toByteArray(Charsets.UTF_8)
+ val msg = ByteArrayOutputStream()
+ msg.write(RESPONSE_CONTEXT.toByteArray(Charsets.UTF_8))
+ msg.write(minOf(noiseData.size, 255))
+ msg.write(noiseData, 0, minOf(noiseData.size, 255))
+ msg.write(nonceA)
+ val signerKey = signerPublicKeyHex.dataFromHexString() ?: return false
+ return service.verifyEd25519Signature(signature, msg.toByteArray(), signerKey)
+ }
+
+ private data class CacheEntry(
+ val nickname: String,
+ val npub: String?,
+ val builtAtMs: Long,
+ val value: String
+ )
+
+ private object Cache {
+ var last: CacheEntry? = null
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt b/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt
index 7c5fa7a0..d931c027 100644
--- a/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt
+++ b/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Bluetooth
+import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.filled.Public
import androidx.compose.material.icons.filled.Warning
@@ -681,6 +682,27 @@ fun AboutSheet(
}
}
+@Composable
+fun CloseButton(
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ IconButton(
+ onClick = onClick,
+ modifier = modifier
+ .size(32.dp),
+ colors = IconButtonDefaults.iconButtonColors(
+ contentColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.6f),
+ containerColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.1f)
+ )
+ ) {
+ Icon(
+ imageVector = Icons.Default.Close,
+ contentDescription = "Close",
+ modifier = Modifier.size(18.dp)
+ )
+ }
+}
/**
* Password prompt dialog for password-protected channels
* Kept as dialog since it requires user input
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
index 1c5c3a11..658d6088 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
@@ -320,6 +320,10 @@ private fun PrivateChatHeader(
) {
val colorScheme = MaterialTheme.colorScheme
val isNostrDM = peerID.startsWith("nostr_") || peerID.startsWith("nostr:")
+ val verifiedFingerprints by viewModel.verifiedFingerprints.collectAsStateWithLifecycle()
+ val isVerified = remember(peerID, verifiedFingerprints) {
+ viewModel.isPeerVerified(peerID, verifiedFingerprints)
+ }
// Determine mutual favorite state for this peer (supports mesh ephemeral 16-hex via favorites lookup)
val isMutualFavorite = remember(peerID, peerNicknames) {
try {
@@ -417,17 +421,33 @@ private fun PrivateChatHeader(
// Show a globe when chatting via Nostr alias, or when mesh session not established but mutual favorite exists
val showGlobe = isNostrDM || (sessionState != "established" && isMutualFavorite)
+ val securityModifier = if (!isNostrDM) {
+ Modifier.clickable { viewModel.showSecurityVerificationSheet() }
+ } else {
+ Modifier
+ }
+
if (showGlobe) {
Icon(
imageVector = Icons.Outlined.Public,
contentDescription = stringResource(R.string.cd_nostr_reachable),
- modifier = Modifier.size(14.dp),
+ modifier = Modifier.size(14.dp).then(securityModifier),
tint = Color(0xFF9B59B6) // Purple like iOS
)
} else {
NoiseSessionIcon(
sessionState = sessionState,
- modifier = Modifier.size(14.dp)
+ modifier = Modifier.size(14.dp).then(securityModifier)
+ )
+ }
+
+ if (isVerified) {
+ Spacer(modifier = Modifier.width(4.dp))
+ Icon(
+ imageVector = Icons.Filled.Verified,
+ contentDescription = stringResource(R.string.verify_title),
+ modifier = Modifier.size(14.dp).then(securityModifier),
+ tint = Color(0xFF32D74B)
)
}
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
index 3c2e262b..c196ece3 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
@@ -58,6 +58,8 @@ fun ChatScreen(viewModel: ChatViewModel) {
val showMentionSuggestions by viewModel.showMentionSuggestions.collectAsStateWithLifecycle()
val mentionSuggestions by viewModel.mentionSuggestions.collectAsStateWithLifecycle()
val showAppInfo by viewModel.showAppInfo.collectAsStateWithLifecycle()
+ val showVerificationSheet by viewModel.showVerificationSheet.collectAsStateWithLifecycle()
+ val showSecurityVerificationSheet by viewModel.showSecurityVerificationSheet.collectAsStateWithLifecycle()
var messageText by remember { mutableStateOf(TextFieldValue("")) }
var showPasswordPrompt by remember { mutableStateOf(false) }
@@ -322,6 +324,10 @@ fun ChatScreen(viewModel: ChatViewModel) {
SidebarOverlay(
viewModel = viewModel,
onDismiss = { viewModel.hideSidebar() },
+ onShowVerification = {
+ viewModel.showVerificationSheet(fromSidebar = true)
+ viewModel.hideSidebar()
+ },
modifier = Modifier.fillMaxSize()
)
}
@@ -368,7 +374,11 @@ fun ChatScreen(viewModel: ChatViewModel) {
},
selectedUserForSheet = selectedUserForSheet,
selectedMessageForSheet = selectedMessageForSheet,
- viewModel = viewModel
+ viewModel = viewModel,
+ showVerificationSheet = showVerificationSheet,
+ onVerificationSheetDismiss = viewModel::hideVerificationSheet,
+ showSecurityVerificationSheet = showSecurityVerificationSheet,
+ onSecurityVerificationSheetDismiss = viewModel::hideSecurityVerificationSheet
)
}
@@ -516,7 +526,11 @@ private fun ChatDialogs(
onUserSheetDismiss: () -> Unit,
selectedUserForSheet: String,
selectedMessageForSheet: BitchatMessage?,
- viewModel: ChatViewModel
+ viewModel: ChatViewModel,
+ showVerificationSheet: Boolean,
+ onVerificationSheetDismiss: () -> Unit,
+ showSecurityVerificationSheet: Boolean,
+ onSecurityVerificationSheetDismiss: () -> Unit
) {
// Password dialog
PasswordPromptDialog(
@@ -570,4 +584,20 @@ private fun ChatDialogs(
viewModel = viewModel
)
}
+
+ if (showVerificationSheet) {
+ VerificationSheet(
+ isPresented = showVerificationSheet,
+ onDismiss = onVerificationSheetDismiss,
+ viewModel = viewModel
+ )
+ }
+
+ if (showSecurityVerificationSheet) {
+ SecurityVerificationSheet(
+ isPresented = showSecurityVerificationSheet,
+ onDismiss = onSecurityVerificationSheetDismiss,
+ viewModel = viewModel
+ )
+ }
}
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatState.kt b/app/src/main/java/com/bitchat/android/ui/ChatState.kt
index 6d0f2364..c4ae3db0 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatState.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatState.kt
@@ -122,6 +122,12 @@ class ChatState(
// Navigation state
private val _showAppInfo = MutableStateFlow(false)
val showAppInfo: StateFlow = _showAppInfo.asStateFlow()
+
+ private val _showVerificationSheet = MutableStateFlow(false)
+ val showVerificationSheet: StateFlow = _showVerificationSheet.asStateFlow()
+
+ private val _showSecurityVerificationSheet = MutableStateFlow(false)
+ val showSecurityVerificationSheet: StateFlow = _showSecurityVerificationSheet.asStateFlow()
// Location channels state (for Nostr geohash features)
private val _selectedLocationChannel = MutableStateFlow(com.bitchat.android.geohash.ChannelID.Mesh)
@@ -302,6 +308,14 @@ class ChatState(
fun setShowAppInfo(show: Boolean) {
_showAppInfo.value = show
}
+
+ fun setShowVerificationSheet(show: Boolean) {
+ _showVerificationSheet.value = show
+ }
+
+ fun setShowSecurityVerificationSheet(show: Boolean) {
+ _showSecurityVerificationSheet.value = show
+ }
fun setSelectedLocationChannel(channel: com.bitchat.android.geohash.ChannelID?) {
_selectedLocationChannel.value = channel
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
index 1196396d..58d5c77f 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
@@ -5,11 +5,15 @@ import android.util.Log
import androidx.core.app.NotificationManagerCompat
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
+import com.bitchat.android.favorites.FavoritesPersistenceService
import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
import com.bitchat.android.mesh.BluetoothMeshDelegate
import com.bitchat.android.mesh.BluetoothMeshService
import com.bitchat.android.model.BitchatMessage
import com.bitchat.android.model.BitchatMessageType
+import com.bitchat.android.nostr.NostrIdentityBridge
import com.bitchat.android.protocol.BitchatPacket
@@ -19,6 +23,13 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import java.util.Date
import kotlin.random.Random
+import com.bitchat.android.services.VerificationService
+import com.bitchat.android.identity.SecureIdentityStateManager
+import com.bitchat.android.noise.NoiseSession
+import com.bitchat.android.nostr.GeohashAliasRegistry
+import com.bitchat.android.util.dataFromHexString
+import com.bitchat.android.util.hexEncodedString
+import java.security.MessageDigest
/**
* Refactored ChatViewModel - Main coordinator for bitchat functionality
@@ -46,6 +57,20 @@ class ChatViewModel(
mediaSendingManager.sendImageNote(toPeerIDOrNull, channelOrNull, filePath)
}
+ fun getCurrentNpub(): String? {
+ return try {
+ NostrIdentityBridge
+ .getCurrentNostrIdentity(getApplication())
+ ?.npub
+ } catch (_: Exception) {
+ null
+ }
+ }
+
+ fun buildMyQRString(nickname: String, npub: String?): String {
+ return VerificationService.buildMyQRString(nickname, npub) ?: ""
+ }
+
// MARK: - State management
private val state = ChatState(
scope = viewModelScope,
@@ -57,6 +82,7 @@ class ChatViewModel(
// Specialized managers
private val dataManager = DataManager(application.applicationContext)
+ private val identityManager by lazy { SecureIdentityStateManager(getApplication()) }
private val messageManager = MessageManager(state)
private val channelManager = ChannelManager(state, messageManager, dataManager, viewModelScope)
@@ -75,6 +101,17 @@ class ChatViewModel(
NotificationIntervalManager()
)
+ private val verificationHandler = VerificationHandler(
+ context = application.applicationContext,
+ scope = viewModelScope,
+ meshService = meshService,
+ identityManager = identityManager,
+ state = state,
+ notificationManager = notificationManager,
+ messageManager = messageManager
+ )
+ val verifiedFingerprints = verificationHandler.verifiedFingerprints
+
// Media file sending manager
private val mediaSendingManager = MediaSendingManager(state, messageManager, channelManager, meshService)
@@ -134,6 +171,8 @@ class ChatViewModel(
val peerRSSI: StateFlow> = state.peerRSSI
val peerDirect: StateFlow> = state.peerDirect
val showAppInfo: StateFlow = state.showAppInfo
+ val showVerificationSheet: StateFlow = state.showVerificationSheet
+ val showSecurityVerificationSheet: StateFlow = state.showSecurityVerificationSheet
val selectedLocationChannel: StateFlow = state.selectedLocationChannel
val isTeleported: StateFlow = state.isTeleported
val geohashPeople: StateFlow> = state.geohashPeople
@@ -247,6 +286,9 @@ class ChatViewModel(
// Initialize favorites persistence service
com.bitchat.android.favorites.FavoritesPersistenceService.initialize(getApplication())
+ // Load verified fingerprints from secure storage
+ verificationHandler.loadVerifiedFingerprints()
+
// Ensure NostrTransport knows our mesh peer ID for embedded packets
try {
@@ -646,6 +688,18 @@ class ChatViewModel(
// Update fingerprint mappings from centralized manager
val fingerprints = privateChatManager.getAllPeerFingerprints()
state.setPeerFingerprints(fingerprints)
+ fingerprints.forEach { (peerID, fingerprint) ->
+ identityManager.cachePeerFingerprint(peerID, fingerprint)
+ val info = try { meshService.getPeerInfo(peerID) } catch (_: Exception) { null }
+ val noiseKeyHex = info?.noisePublicKey?.hexEncodedString()
+ if (noiseKeyHex != null) {
+ identityManager.cachePeerNoiseKey(peerID, noiseKeyHex)
+ identityManager.cacheNoiseFingerprint(noiseKeyHex, fingerprint)
+ }
+ info?.nickname?.takeIf { it.isNotBlank() }?.let { nickname ->
+ identityManager.cacheFingerprintNickname(fingerprint, nickname)
+ }
+ }
val nicknames = meshService.getPeerNicknames()
state.setPeerNicknames(nicknames)
@@ -660,6 +714,34 @@ class ChatViewModel(
}
state.setPeerDirect(directMap)
} catch (_: Exception) { }
+
+ // Flush any pending QR verification once a Noise session is established
+ currentPeers.forEach { peerID ->
+ if (meshService.getSessionState(peerID) is NoiseSession.NoiseSessionState.Established) {
+ verificationHandler.sendPendingVerificationIfNeeded(peerID)
+ }
+ }
+ }
+
+ // MARK: - QR Verification
+
+ fun isPeerVerified(peerID: String, verifiedFingerprints: Set): Boolean {
+ if (peerID.startsWith("nostr_") || peerID.startsWith("nostr:")) return false
+ val fingerprint = verificationHandler.getPeerFingerprintForDisplay(peerID)
+ return fingerprint != null && verifiedFingerprints.contains(fingerprint)
+ }
+
+ fun isNoisePublicKeyVerified(noisePublicKey: ByteArray, verifiedFingerprints: Set): Boolean {
+ val fingerprint = verificationHandler.fingerprintFromNoiseBytes(noisePublicKey)
+ return verifiedFingerprints.contains(fingerprint)
+ }
+
+ fun unverifyFingerprint(peerID: String) {
+ verificationHandler.unverifyFingerprint(peerID)
+ }
+
+ fun beginQRVerification(qr: VerificationService.VerificationQR): Boolean {
+ return verificationHandler.beginQRVerification(qr)
}
// MARK: - Debug and Troubleshooting
@@ -668,41 +750,75 @@ class ChatViewModel(
return meshService.getDebugStatus()
}
- // Note: Mesh service restart is now handled by MainActivity
- // This function is no longer needed
-
fun setAppBackgroundState(inBackground: Boolean) {
- // Forward to notification manager for notification logic
notificationManager.setAppBackgroundState(inBackground)
}
fun setCurrentPrivateChatPeer(peerID: String?) {
- // Update notification manager with current private chat peer
notificationManager.setCurrentPrivateChatPeer(peerID)
}
fun setCurrentGeohash(geohash: String?) {
- // Update notification manager with current geohash for notification logic
notificationManager.setCurrentGeohash(geohash)
}
fun clearNotificationsForSender(peerID: String) {
- // Clear notifications when user opens a chat
notificationManager.clearNotificationsForSender(peerID)
}
fun clearNotificationsForGeohash(geohash: String) {
- // Clear notifications when user opens a geohash chat
notificationManager.clearNotificationsForGeohash(geohash)
}
- /**
- * Clear mesh mention notifications when user opens mesh chat
- */
fun clearMeshMentionNotifications() {
notificationManager.clearMeshMentionNotifications()
}
+ private var reopenSidebarAfterVerification = false
+
+ fun showVerificationSheet(fromSidebar: Boolean = false) {
+ if (fromSidebar) {
+ reopenSidebarAfterVerification = true
+ }
+ state.setShowVerificationSheet(true)
+ }
+
+ fun hideVerificationSheet() {
+ state.setShowVerificationSheet(false)
+ if (reopenSidebarAfterVerification) {
+ reopenSidebarAfterVerification = false
+ state.setShowSidebar(true)
+ }
+ }
+
+ fun showSecurityVerificationSheet() {
+ state.setShowSecurityVerificationSheet(true)
+ }
+
+ fun hideSecurityVerificationSheet() {
+ state.setShowSecurityVerificationSheet(false)
+ }
+
+ fun getPeerFingerprintForDisplay(peerID: String): String? {
+ return verificationHandler.getPeerFingerprintForDisplay(peerID)
+ }
+
+ fun getMyFingerprint(): String {
+ return verificationHandler.getMyFingerprint()
+ }
+
+ fun resolvePeerDisplayNameForFingerprint(peerID: String): String {
+ return verificationHandler.resolvePeerDisplayNameForFingerprint(peerID)
+ }
+
+ fun verifyFingerprintValue(fingerprint: String) {
+ verificationHandler.verifyFingerprintValue(fingerprint)
+ }
+
+ fun unverifyFingerprintValue(fingerprint: String) {
+ verificationHandler.unverifyFingerprintValue(fingerprint)
+ }
+
// MARK: - Command Autocomplete (delegated)
fun updateCommandSuggestions(input: String) {
@@ -744,6 +860,14 @@ class ChatViewModel(
override fun didReceiveReadReceipt(messageID: String, recipientPeerID: String) {
meshDelegateHandler.didReceiveReadReceipt(messageID, recipientPeerID)
}
+
+ override fun didReceiveVerifyChallenge(peerID: String, payload: ByteArray, timestampMs: Long) {
+ verificationHandler.didReceiveVerifyChallenge(peerID, payload)
+ }
+
+ override fun didReceiveVerifyResponse(peerID: String, payload: ByteArray, timestampMs: Long) {
+ verificationHandler.didReceiveVerifyResponse(peerID, payload)
+ }
override fun decryptChannelMessage(encryptedContent: ByteArray, channel: String): String? {
return meshDelegateHandler.decryptChannelMessage(encryptedContent, channel)
@@ -827,7 +951,7 @@ class ChatViewModel(
// Clear secure identity state (if used)
try {
- val identityManager = com.bitchat.android.identity.SecureIdentityStateManager(getApplication())
+ val identityManager = SecureIdentityStateManager(getApplication())
identityManager.clearIdentityData()
// Also clear secure values used by FavoritesPersistenceService (favorites + peerID index)
try {
@@ -840,7 +964,7 @@ class ChatViewModel(
// Clear FavoritesPersistenceService persistent relationships
try {
- com.bitchat.android.favorites.FavoritesPersistenceService.shared.clearAllFavorites()
+ FavoritesPersistenceService.shared.clearAllFavorites()
Log.d(TAG, "✅ Cleared FavoritesPersistenceService relationships")
} catch (_: Exception) { }
@@ -969,5 +1093,6 @@ class ChatViewModel(
*/
fun colorForNostrPubkey(pubkeyHex: String, isDark: Boolean): androidx.compose.ui.graphics.Color {
return geohashViewModel.colorForNostrPubkey(pubkeyHex, isDark)
- }
+}
+
}
diff --git a/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt b/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt
index a452616e..d27719c7 100644
--- a/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt
+++ b/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt
@@ -216,6 +216,14 @@ class MeshDelegateHandler(
messageManager.updateMessageDeliveryStatus(messageID, DeliveryStatus.Read(recipientPeerID, Date()))
}
}
+
+ override fun didReceiveVerifyChallenge(peerID: String, payload: ByteArray, timestampMs: Long) {
+ // Handled by ChatViewModel for verification flow
+ }
+
+ override fun didReceiveVerifyResponse(peerID: String, payload: ByteArray, timestampMs: Long) {
+ // Handled by ChatViewModel for verification flow
+ }
override fun decryptChannelMessage(encryptedContent: ByteArray, channel: String): String? {
return channelManager.decryptChannelMessage(encryptedContent, channel)
diff --git a/app/src/main/java/com/bitchat/android/ui/NotificationManager.kt b/app/src/main/java/com/bitchat/android/ui/NotificationManager.kt
index 622800ca..9eb72b48 100644
--- a/app/src/main/java/com/bitchat/android/ui/NotificationManager.kt
+++ b/app/src/main/java/com/bitchat/android/ui/NotificationManager.kt
@@ -280,6 +280,37 @@ class NotificationManager(
Log.d(TAG, "Displayed notification for $contentTitle with ID $notificationId")
}
+ fun showVerificationNotification(title: String, body: String, peerID: String? = null) {
+ val intent = Intent(context, MainActivity::class.java).apply {
+ flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
+ if (peerID != null) {
+ putExtra(EXTRA_OPEN_PRIVATE_CHAT, true)
+ putExtra(EXTRA_PEER_ID, peerID)
+ putExtra(EXTRA_SENDER_NICKNAME, body)
+ }
+ }
+
+ val pendingIntent = PendingIntent.getActivity(
+ context,
+ (System.currentTimeMillis() and 0x7FFFFFFF).toInt(),
+ intent,
+ PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+ )
+
+ val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+ .setSmallIcon(R.drawable.ic_notification)
+ .setContentTitle(title)
+ .setContentText(body)
+ .setContentIntent(pendingIntent)
+ .setAutoCancel(true)
+ .setPriority(NotificationCompat.PRIORITY_HIGH)
+ .setCategory(NotificationCompat.CATEGORY_STATUS)
+ .setShowWhen(true)
+ .setWhen(System.currentTimeMillis())
+
+ notificationManager.notify((System.currentTimeMillis() and 0x7FFFFFFF).toInt(), builder.build())
+ }
+
private fun showNotificationForActivePeers(peersSize: Int) {
// Create intent to open the app
val intent = Intent(context, MainActivity::class.java).apply {
diff --git a/app/src/main/java/com/bitchat/android/ui/SecurityVerificationSheet.kt b/app/src/main/java/com/bitchat/android/ui/SecurityVerificationSheet.kt
new file mode 100644
index 00000000..59fe6085
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/ui/SecurityVerificationSheet.kt
@@ -0,0 +1,443 @@
+package com.bitchat.android.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material.icons.filled.Verified
+import androidx.compose.material.icons.filled.Warning
+import androidx.compose.material.icons.outlined.NoEncryption
+import androidx.compose.material.icons.outlined.Sync
+import androidx.compose.material.icons.outlined.Warning as OutlinedWarning
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.bitchat.android.R
+
+private data class SecurityStatusInfo(
+ val text: String,
+ val icon: ImageVector,
+ val tint: Color
+)
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SecurityVerificationSheet(
+ isPresented: Boolean,
+ onDismiss: () -> Unit,
+ viewModel: ChatViewModel,
+ modifier: Modifier = Modifier
+) {
+ if (!isPresented) return
+
+ val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+ val peerID by viewModel.selectedPrivateChatPeer.collectAsStateWithLifecycle()
+ val verifiedFingerprints by viewModel.verifiedFingerprints.collectAsStateWithLifecycle()
+ val peerSessionStates by viewModel.peerSessionStates.collectAsStateWithLifecycle()
+
+ val isDark = isSystemInDarkTheme()
+ val accent = if (isDark) Color.Green else Color(0xFF008000)
+ val boxColor = if (isDark) Color.White.copy(alpha = 0.06f) else Color.Black.copy(alpha = 0.06f)
+ val peerHexRegex = remember { Regex("^[0-9a-fA-F]{16}$") }
+
+ ModalBottomSheet(
+ modifier = modifier.statusBarsPadding(),
+ onDismissRequest = onDismiss,
+ sheetState = sheetState,
+ containerColor = MaterialTheme.colorScheme.background,
+ dragHandle = null
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(horizontal = 16.dp, vertical = 12.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ SecurityVerificationHeader(
+ accent = accent,
+ onClose = onDismiss
+ )
+
+ if (peerID == null) {
+ Text(
+ text = stringResource(R.string.fingerprint_no_peer),
+ style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace),
+ color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f)
+ )
+ } else {
+ val selectedPeerID = peerID!!
+ val displayName = viewModel.resolvePeerDisplayNameForFingerprint(selectedPeerID)
+ val fingerprint = viewModel.getPeerFingerprintForDisplay(selectedPeerID)
+ val isVerified = fingerprint != null && verifiedFingerprints.contains(fingerprint)
+ val sessionState = peerSessionStates[selectedPeerID]
+ val statusInfo = buildStatusInfo(
+ isVerified = isVerified,
+ sessionState = sessionState,
+ accent = accent
+ )
+
+ SecurityStatusCard(
+ displayName = displayName,
+ accent = accent,
+ boxColor = boxColor,
+ statusInfo = statusInfo
+ )
+
+ FingerprintBlock(
+ title = stringResource(R.string.fingerprint_their),
+ fingerprint = fingerprint,
+ boxColor = boxColor,
+ accent = accent
+ )
+
+ FingerprintBlock(
+ title = stringResource(R.string.fingerprint_yours),
+ fingerprint = viewModel.getMyFingerprint(),
+ boxColor = boxColor,
+ accent = accent
+ )
+
+ SecurityVerificationActions(
+ isVerified = isVerified,
+ fingerprint = fingerprint,
+ displayName = displayName,
+ accent = accent,
+ canStartHandshake = fingerprint == null && selectedPeerID.matches(peerHexRegex),
+ onStartHandshake = { viewModel.meshService.initiateNoiseHandshake(selectedPeerID) },
+ onVerify = { fp -> viewModel.verifyFingerprintValue(fp) },
+ onUnverify = { fp -> viewModel.unverifyFingerprintValue(fp) }
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun SecurityVerificationHeader(
+ accent: Color,
+ onClose: () -> Unit
+) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = stringResource(R.string.security_verification_title),
+ style = MaterialTheme.typography.titleSmall.copy(
+ fontFamily = FontFamily.Monospace,
+ fontWeight = FontWeight.Bold
+ ),
+ color = accent
+ )
+ Spacer(modifier = Modifier.weight(1f))
+ CloseButton(onClick = onClose)
+ }
+}
+
+@Composable
+private fun buildStatusInfo(
+ isVerified: Boolean,
+ sessionState: String?,
+ accent: Color
+): SecurityStatusInfo {
+ val text = when {
+ isVerified -> stringResource(R.string.fingerprint_status_verified)
+ sessionState == "established" -> stringResource(R.string.fingerprint_status_encrypted)
+ sessionState == "handshaking" -> stringResource(R.string.fingerprint_status_handshaking)
+ sessionState == "failed" -> stringResource(R.string.fingerprint_status_failed)
+ else -> stringResource(R.string.fingerprint_status_uninitialized)
+ }
+ val icon = when {
+ isVerified -> Icons.Filled.Verified
+ sessionState == "handshaking" -> Icons.Outlined.Sync
+ sessionState == "failed" -> Icons.Outlined.OutlinedWarning
+ sessionState == "established" -> Icons.Filled.Lock
+ else -> Icons.Outlined.NoEncryption
+ }
+ val tint = when {
+ isVerified -> Color(0xFF32D74B)
+ sessionState == "failed" -> Color(0xFFFF3B30)
+ sessionState == "handshaking" -> Color(0xFFFF9500)
+ sessionState == "established" -> Color(0xFF32D74B)
+ else -> accent.copy(alpha = 0.6f)
+ }
+ return SecurityStatusInfo(text, icon, tint)
+}
+
+@Composable
+private fun SecurityStatusCard(
+ displayName: String,
+ accent: Color,
+ boxColor: Color,
+ statusInfo: SecurityStatusInfo
+) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .background(boxColor, shape = MaterialTheme.shapes.medium)
+ .padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = statusInfo.icon,
+ contentDescription = null,
+ tint = statusInfo.tint
+ )
+ Spacer(modifier = Modifier.width(12.dp))
+ Column {
+ Text(
+ text = displayName,
+ style = MaterialTheme.typography.titleMedium.copy(
+ fontFamily = FontFamily.Monospace,
+ fontWeight = FontWeight.Bold
+ ),
+ color = accent
+ )
+ Text(
+ text = statusInfo.text,
+ style = MaterialTheme.typography.bodySmall.copy(
+ fontFamily = FontFamily.Monospace
+ ),
+ color = accent.copy(alpha = 0.8f)
+ )
+ }
+ }
+}
+
+@Composable
+private fun SecurityVerificationActions(
+ isVerified: Boolean,
+ fingerprint: String?,
+ displayName: String,
+ accent: Color,
+ canStartHandshake: Boolean,
+ onStartHandshake: () -> Unit,
+ onVerify: (String) -> Unit,
+ onUnverify: (String) -> Unit
+) {
+ if (canStartHandshake) {
+ Button(
+ onClick = onStartHandshake,
+ colors = ButtonDefaults.buttonColors(
+ containerColor = accent,
+ contentColor = Color.White
+ ),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text(
+ text = stringResource(R.string.fingerprint_start_handshake),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 12.sp
+ )
+ }
+ }
+
+ if (isVerified) {
+ VerificationStatusRow(
+ icon = Icons.Filled.Verified,
+ iconTint = Color(0xFF32D74B),
+ text = stringResource(R.string.fingerprint_verified_label),
+ textTint = Color(0xFF32D74B)
+ )
+ Text(
+ text = stringResource(R.string.fingerprint_verified_message),
+ style = MaterialTheme.typography.bodySmall.copy(
+ fontFamily = FontFamily.Monospace
+ ),
+ color = accent.copy(alpha = 0.7f),
+ modifier = Modifier.fillMaxWidth(),
+ textAlign = TextAlign.Center
+ )
+ Button(
+ onClick = { fingerprint?.let(onUnverify) },
+ colors = ButtonDefaults.buttonColors(
+ containerColor = Color(0xFFFF3B30),
+ contentColor = Color.White
+ ),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text(
+ text = stringResource(R.string.verify_remove),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 12.sp
+ )
+ }
+ } else {
+ VerificationStatusRow(
+ icon = Icons.Filled.Warning,
+ iconTint = Color(0xFFFF9500),
+ text = stringResource(R.string.fingerprint_not_verified_label),
+ textTint = Color(0xFFFF9500)
+ )
+ Text(
+ text = stringResource(R.string.fingerprint_not_verified_message_fmt, displayName),
+ style = MaterialTheme.typography.bodySmall.copy(
+ fontFamily = FontFamily.Monospace
+ ),
+ color = accent.copy(alpha = 0.7f),
+ modifier = Modifier.fillMaxWidth(),
+ textAlign = TextAlign.Center
+ )
+ if (fingerprint != null) {
+ Button(
+ onClick = { onVerify(fingerprint) },
+ colors = ButtonDefaults.buttonColors(
+ containerColor = Color(0xFF34C759),
+ contentColor = Color.White
+ ),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text(
+ text = stringResource(R.string.fingerprint_mark_verified),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 12.sp
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun VerificationStatusRow(
+ icon: ImageVector,
+ iconTint: Color,
+ text: String,
+ textTint: Color
+) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = icon,
+ contentDescription = null,
+ tint = iconTint
+ )
+ Spacer(modifier = Modifier.width(6.dp))
+ Text(
+ text = text,
+ style = MaterialTheme.typography.bodyMedium.copy(
+ fontFamily = FontFamily.Monospace,
+ fontWeight = FontWeight.Bold
+ ),
+ color = textTint
+ )
+ }
+}
+
+@Composable
+private fun FingerprintBlock(
+ title: String,
+ fingerprint: String?,
+ boxColor: Color,
+ accent: Color
+) {
+ val clipboardManager = LocalClipboardManager.current
+ var showMenu by remember(fingerprint) { mutableStateOf(false) }
+ val interactionSource = remember { MutableInteractionSource() }
+
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ Text(
+ text = title,
+ style = MaterialTheme.typography.labelSmall.copy(
+ fontFamily = FontFamily.Monospace,
+ fontWeight = FontWeight.Bold
+ ),
+ color = accent.copy(alpha = 0.8f)
+ )
+ if (fingerprint != null) {
+ Column {
+ Text(
+ text = formatFingerprint(fingerprint),
+ style = MaterialTheme.typography.bodyMedium.copy(
+ fontFamily = FontFamily.Monospace,
+ fontSize = 14.sp
+ ),
+ color = accent,
+ textAlign = TextAlign.Center,
+ modifier = Modifier
+ .fillMaxWidth()
+ .combinedClickable(
+ interactionSource = interactionSource,
+ indication = null,
+ onClick = {},
+ onLongClick = { showMenu = true }
+ )
+ .background(boxColor, shape = MaterialTheme.shapes.small)
+ .padding(16.dp),
+ )
+ DropdownMenu(
+ expanded = showMenu,
+ onDismissRequest = { showMenu = false }
+ ) {
+ DropdownMenuItem(
+ text = { Text(text = stringResource(R.string.fingerprint_copy)) },
+ onClick = {
+ clipboardManager.setText(AnnotatedString(fingerprint))
+ showMenu = false
+ }
+ )
+ }
+ }
+ } else {
+ Text(
+ text = stringResource(R.string.fingerprint_pending),
+ style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace),
+ color = Color(0xFFFF9500),
+ modifier = Modifier.padding(16.dp)
+ )
+ }
+ }
+}
+
+private fun formatFingerprint(fingerprint: String): String {
+ val upper = fingerprint.uppercase()
+ val sb = StringBuilder()
+ upper.forEachIndexed { index, c ->
+ if (index > 0 && index % 4 == 0) {
+ if (index % 16 == 0) sb.append('\n') else sb.append(' ')
+ }
+ sb.append(c)
+ }
+ return sb.toString()
+}
diff --git a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt
index 4ab4360a..9b8328d6 100644
--- a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt
+++ b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.unit.sp
import androidx.compose.ui.text.style.TextOverflow
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.bitchat.android.ui.theme.BASE_FONT_SIZE
+import com.bitchat.android.util.hexEncodedString
/**
@@ -34,6 +35,7 @@ import com.bitchat.android.ui.theme.BASE_FONT_SIZE
fun SidebarOverlay(
viewModel: ChatViewModel,
onDismiss: () -> Unit,
+ onShowVerification: () -> Unit,
modifier: Modifier = Modifier
) {
val colorScheme = MaterialTheme.colorScheme
@@ -131,6 +133,7 @@ fun SidebarOverlay(
colorScheme = colorScheme,
selectedPrivatePeer = selectedPrivatePeer,
viewModel = viewModel,
+ onShowVerification = onShowVerification,
onPrivateChatStart = { peerID ->
viewModel.startPrivateChat(peerID)
onDismiss()
@@ -257,8 +260,11 @@ fun PeopleSection(
colorScheme: ColorScheme,
selectedPrivatePeer: String?,
viewModel: ChatViewModel,
+ onShowVerification: () -> Unit,
onPrivateChatStart: (String) -> Unit
) {
+ val selectedLocationChannel by viewModel.selectedLocationChannel.collectAsStateWithLifecycle()
+
Column(modifier = modifier) {
Row(
modifier = Modifier
@@ -279,6 +285,17 @@ fun PeopleSection(
color = colorScheme.onSurface.copy(alpha = 0.6f),
fontWeight = FontWeight.Bold
)
+ Spacer(modifier = Modifier.weight(1f))
+ if (selectedLocationChannel !is com.bitchat.android.geohash.ChannelID.Location) {
+ IconButton(onClick = onShowVerification, modifier = Modifier.size(24.dp)) {
+ Icon(
+ imageVector = Icons.Outlined.QrCode,
+ contentDescription = stringResource(R.string.verify_title),
+ tint = colorScheme.onSurface.copy(alpha = 0.8f),
+ modifier = Modifier.size(16.dp)
+ )
+ }
+ }
}
if (connectedPeers.isEmpty()) {
@@ -295,6 +312,7 @@ fun PeopleSection(
val privateChats by viewModel.privateChats.collectAsStateWithLifecycle()
val favoritePeers by viewModel.favoritePeers.collectAsStateWithLifecycle()
val peerFingerprints by viewModel.peerFingerprints.collectAsStateWithLifecycle()
+ val verifiedFingerprints by viewModel.verifiedFingerprints.collectAsStateWithLifecycle()
// Reactive favorite computation for all peers
val peerFavoriteStates = remember(favoritePeers, peerFingerprints, connectedPeers) {
@@ -308,10 +326,16 @@ fun PeopleSection(
// Build mapping of connected peerID -> noise key hex to unify with offline favorites
val noiseHexByPeerID: Map = connectedPeers.associateWith { pid ->
try {
- viewModel.meshService.getPeerInfo(pid)?.noisePublicKey?.joinToString("") { b -> "%02x".format(b) }
+ viewModel.meshService.getPeerInfo(pid)?.noisePublicKey?.hexEncodedString()
} catch (_: Exception) { null }
}.filterValues { it != null }.mapValues { it.value!! }
+ val peerVerifiedStates = remember(verifiedFingerprints, peerFingerprints, connectedPeers) {
+ connectedPeers.associateWith { peerID ->
+ viewModel.isPeerVerified(peerID, verifiedFingerprints)
+ }
+ }
+
Log.d("SidebarComponents", "Recomposing with ${favoritePeers.size} favorites, peer states: $peerFavoriteStates")
// Smart sorting: unread DMs first, then by most recent DM, then favorites, then alphabetical
@@ -342,7 +366,7 @@ fun PeopleSection(
// Offline favorites (exclude ones mapped to connected)
val offlineFavorites = com.bitchat.android.favorites.FavoritesPersistenceService.shared.getOurFavorites()
offlineFavorites.forEach { fav ->
- val favPeerID = fav.peerNoisePublicKey.joinToString("") { b -> "%02x".format(b) }
+ val favPeerID = fav.peerNoisePublicKey.hexEncodedString()
val isMappedToConnected = noiseHexByPeerID.values.any { it.equals(favPeerID, ignoreCase = true) }
if (!isMappedToConnected) {
val dn = peerNicknames[favPeerID] ?: fav.peerNickname
@@ -368,6 +392,7 @@ fun PeopleSection(
sortedPeers.forEach { peerID ->
val isFavorite = peerFavoriteStates[peerID] ?: false
+ val isVerified = peerVerifiedStates[peerID] ?: false
// fingerprint and favorite relationship resolution not needed here; UI will show Nostr globe for appended offline favorites below
val noiseHex = noiseHexByPeerID[peerID]
@@ -392,6 +417,7 @@ fun PeopleSection(
isDirect = isDirectLive,
isSelected = peerID == selectedPrivatePeer,
isFavorite = isFavorite,
+ isVerified = isVerified,
hasUnreadDM = combinedHasUnread,
colorScheme = colorScheme,
viewModel = viewModel,
@@ -408,7 +434,7 @@ fun PeopleSection(
// Append offline favorites we actively favorite (and not currently connected)
offlineFavorites.forEach { fav ->
- val favPeerID = fav.peerNoisePublicKey.joinToString("") { b -> "%02x".format(b) }
+ val favPeerID = fav.peerNoisePublicKey.hexEncodedString()
// If any connected peer maps to this noise key, skip showing the offline entry
val isMappedToConnected = noiseHexByPeerID.values.any { it.equals(favPeerID, ignoreCase = true) }
if (isMappedToConnected) return@forEach
@@ -419,7 +445,7 @@ fun PeopleSection(
if (npubOrHex != null) {
val hex = if (npubOrHex.startsWith("npub")) {
val (hrp, data) = com.bitchat.android.nostr.Bech32.decode(npubOrHex)
- if (hrp == "npub") data.joinToString("") { "%02x".format(it) } else null
+ if (hrp == "npub") data.hexEncodedString() else null
} else {
npubOrHex.lowercase()
}
@@ -435,6 +461,7 @@ fun PeopleSection(
val dn = peerNicknames[favPeerID] ?: fav.peerNickname
val (bName, _) = com.bitchat.android.ui.splitSuffix(dn)
val showHash = (baseNameCounts[bName] ?: 0) > 1
+ val isVerified = viewModel.isNoisePublicKeyVerified(fav.peerNoisePublicKey, verifiedFingerprints)
// Compute unreadCount from either noise conversation or Nostr conversation
val unreadCount = (
@@ -449,6 +476,7 @@ fun PeopleSection(
isDirect = false,
isSelected = (mappedConnectedPeerID ?: favPeerID) == selectedPrivatePeer,
isFavorite = true,
+ isVerified = isVerified,
hasUnreadDM = hasUnread,
colorScheme = colorScheme,
viewModel = viewModel,
@@ -516,6 +544,7 @@ private fun PeerItem(
isDirect: Boolean,
isSelected: Boolean,
isFavorite: Boolean,
+ isVerified: Boolean,
hasUnreadDM: Boolean,
colorScheme: ColorScheme,
viewModel: ChatViewModel,
@@ -616,6 +645,16 @@ private fun PeerItem(
color = baseColor.copy(alpha = 0.6f)
)
}
+
+ if (isVerified) {
+ Spacer(modifier = Modifier.width(4.dp))
+ Icon(
+ imageVector = Icons.Filled.Verified,
+ contentDescription = null,
+ modifier = Modifier.size(14.dp),
+ tint = Color(0xFF32D74B)
+ )
+ }
}
// Favorite star with proper filled/outlined states
diff --git a/app/src/main/java/com/bitchat/android/ui/VerificationHandler.kt b/app/src/main/java/com/bitchat/android/ui/VerificationHandler.kt
new file mode 100644
index 00000000..32620281
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/ui/VerificationHandler.kt
@@ -0,0 +1,368 @@
+package com.bitchat.android.ui
+
+import android.content.Context
+import com.bitchat.android.R
+import com.bitchat.android.favorites.FavoritesPersistenceService
+import com.bitchat.android.identity.SecureIdentityStateManager
+import com.bitchat.android.mesh.BluetoothMeshService
+import com.bitchat.android.model.BitchatMessage
+import com.bitchat.android.noise.NoiseSession
+import com.bitchat.android.nostr.GeohashAliasRegistry
+import com.bitchat.android.services.VerificationService
+import com.bitchat.android.util.dataFromHexString
+import com.bitchat.android.util.hexEncodedString
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import java.security.MessageDigest
+import java.util.Date
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * Handles QR verification logic and state, extracted from ChatViewModel.
+ */
+class VerificationHandler(
+ private val context: Context,
+ private val scope: CoroutineScope,
+ private val meshService: BluetoothMeshService,
+ private val identityManager: SecureIdentityStateManager,
+ private val state: ChatState,
+ private val notificationManager: NotificationManager,
+ private val messageManager: MessageManager
+) {
+
+ private val _verifiedFingerprints = MutableStateFlow>(emptySet())
+ val verifiedFingerprints: StateFlow> = _verifiedFingerprints.asStateFlow()
+
+ private val pendingQRVerifications = ConcurrentHashMap()
+ private val lastVerifyNonceByPeer = ConcurrentHashMap()
+ private val lastInboundVerifyChallengeAt = ConcurrentHashMap()
+ private val lastMutualToastAt = ConcurrentHashMap()
+
+ fun loadVerifiedFingerprints() {
+ _verifiedFingerprints.value = identityManager.getVerifiedFingerprints()
+ }
+
+ fun isPeerVerified(peerID: String): Boolean {
+ if (peerID.startsWith("nostr_") || peerID.startsWith("nostr:")) return false
+ val fingerprint = getPeerFingerprintForDisplay(peerID)
+ return fingerprint != null && _verifiedFingerprints.value.contains(fingerprint)
+ }
+
+ fun isNoisePublicKeyVerified(noisePublicKey: ByteArray): Boolean {
+ val fingerprint = fingerprintFromNoiseBytes(noisePublicKey)
+ return _verifiedFingerprints.value.contains(fingerprint)
+ }
+
+ fun unverifyFingerprint(peerID: String) {
+ val fingerprint = meshService.getPeerFingerprint(peerID) ?: return
+ identityManager.setVerifiedFingerprint(fingerprint, false)
+ val current = _verifiedFingerprints.value.toMutableSet()
+ current.remove(fingerprint)
+ _verifiedFingerprints.value = current
+ }
+
+ fun beginQRVerification(qr: VerificationService.VerificationQR): Boolean {
+ val targetNoise = qr.noiseKeyHex.lowercase()
+ val peerID = state.getConnectedPeersValue().firstOrNull { pid ->
+ val noiseKeyHex = meshService.getPeerInfo(pid)?.noisePublicKey?.hexEncodedString()?.lowercase()
+ noiseKeyHex == targetNoise
+ } ?: return false
+
+ if (pendingQRVerifications.containsKey(peerID)) return true
+ val nonce = ByteArray(16)
+ java.security.SecureRandom().nextBytes(nonce)
+ val pending = PendingVerification(qr.noiseKeyHex, qr.signKeyHex, nonce, System.currentTimeMillis(), false)
+ pendingQRVerifications[peerID] = pending
+
+ if (meshService.getSessionState(peerID) is NoiseSession.NoiseSessionState.Established) {
+ meshService.sendVerifyChallenge(peerID, qr.noiseKeyHex, nonce)
+ pendingQRVerifications[peerID] = pending.copy(sent = true)
+ } else {
+ meshService.initiateNoiseHandshake(peerID)
+ }
+ fingerprintFromNoiseHex(qr.noiseKeyHex)?.let { fp ->
+ identityManager.cacheFingerprintNickname(fp, qr.nickname)
+ identityManager.cacheNoiseFingerprint(qr.noiseKeyHex, fp)
+ identityManager.cachePeerNoiseKey(peerID, qr.noiseKeyHex)
+ }
+ return true
+ }
+
+ fun sendPendingVerificationIfNeeded(peerID: String) {
+ val pending = pendingQRVerifications[peerID] ?: return
+ if (pending.sent) return
+ meshService.sendVerifyChallenge(peerID, pending.noiseKeyHex, pending.nonceA)
+ pendingQRVerifications[peerID] = pending.copy(sent = true)
+ }
+
+ fun didReceiveVerifyChallenge(peerID: String, payload: ByteArray) {
+ scope.launch {
+ val parsed = VerificationService.parseVerifyChallenge(payload) ?: return@launch
+ val myNoiseHex = meshService.getStaticNoisePublicKey()?.hexEncodedString()?.lowercase() ?: return@launch
+ if (parsed.first.lowercase() != myNoiseHex) return@launch
+
+ val lastNonce = lastVerifyNonceByPeer[peerID]
+ if (lastNonce != null && lastNonce.contentEquals(parsed.second)) return@launch
+ lastVerifyNonceByPeer[peerID] = parsed.second
+
+ val fp = meshService.getPeerFingerprint(peerID)
+ if (fp != null) {
+ lastInboundVerifyChallengeAt[fp] = System.currentTimeMillis()
+ if (_verifiedFingerprints.value.contains(fp)) {
+ val lastToast = lastMutualToastAt[fp] ?: 0L
+ if (System.currentTimeMillis() - lastToast > 60_000L) {
+ lastMutualToastAt[fp] = System.currentTimeMillis()
+ val name = resolvePeerDisplayName(peerID)
+ val body = context.getString(R.string.verify_mutual_match_body, name)
+ addVerificationSystemMessage(peerID, context.getString(R.string.verify_mutual_system_message, name))
+ sendVerificationNotification(context.getString(R.string.verify_mutual_match_title), body, peerID)
+ }
+ }
+ }
+
+ meshService.sendVerifyResponse(peerID, parsed.first, parsed.second)
+ }
+ }
+
+ fun didReceiveVerifyResponse(peerID: String, payload: ByteArray) {
+ scope.launch {
+ val resp = VerificationService.parseVerifyResponse(payload) ?: return@launch
+ val pending = pendingQRVerifications[peerID] ?: return@launch
+ if (!resp.noiseKeyHex.equals(pending.noiseKeyHex, ignoreCase = true)) return@launch
+ if (!resp.nonceA.contentEquals(pending.nonceA)) return@launch
+
+ val ok = VerificationService.verifyResponseSignature(
+ noiseKeyHex = resp.noiseKeyHex,
+ nonceA = resp.nonceA,
+ signature = resp.signature,
+ signerPublicKeyHex = pending.signKeyHex
+ )
+ if (!ok) return@launch
+
+ pendingQRVerifications.remove(peerID)
+ val fp = meshService.getPeerFingerprint(peerID) ?: return@launch
+ identityManager.setVerifiedFingerprint(fp, true)
+ val current = _verifiedFingerprints.value.toMutableSet()
+ current.add(fp)
+ _verifiedFingerprints.value = current
+
+ val name = resolvePeerDisplayName(peerID)
+ identityManager.cacheFingerprintNickname(fp, name)
+ val noiseKeyHex = try {
+ meshService.getPeerInfo(peerID)?.noisePublicKey?.hexEncodedString()
+ } catch (_: Exception) {
+ null
+ }
+ if (noiseKeyHex != null) {
+ identityManager.cachePeerNoiseKey(peerID, noiseKeyHex)
+ identityManager.cacheNoiseFingerprint(noiseKeyHex, fp)
+ }
+ addVerificationSystemMessage(peerID, context.getString(R.string.verify_success_system_message, name))
+ sendVerificationNotification(context.getString(R.string.verify_success_title), context.getString(R.string.verify_success_body, name), peerID)
+
+ val lastChallenge = lastInboundVerifyChallengeAt[fp] ?: 0L
+ if (System.currentTimeMillis() - lastChallenge < 600_000L) {
+ val lastToast = lastMutualToastAt[fp] ?: 0L
+ if (System.currentTimeMillis() - lastToast > 60_000L) {
+ lastMutualToastAt[fp] = System.currentTimeMillis()
+ val body = context.getString(R.string.verify_mutual_match_body, name)
+ addVerificationSystemMessage(peerID, context.getString(R.string.verify_mutual_system_message, name))
+ sendVerificationNotification(context.getString(R.string.verify_mutual_match_title), body, peerID)
+ }
+ }
+ }
+ }
+
+ fun getPeerFingerprintForDisplay(peerID: String): String? {
+ val fromMap = state.getPeerFingerprintsValue()[peerID]
+ if (fromMap != null) return fromMap
+ val hexRegex = Regex("^[0-9a-fA-F]+$")
+ return try {
+ when {
+ peerID.length == 64 && peerID.matches(hexRegex) -> {
+ identityManager.getCachedNoiseFingerprint(peerID)?.let { return it }
+ fingerprintFromNoiseHex(peerID)?.also { identityManager.cacheNoiseFingerprint(peerID, it) }
+ }
+ peerID.length == 16 && peerID.matches(hexRegex) -> {
+ val meshFp = meshService.getPeerFingerprint(peerID)
+ if (meshFp != null) return meshFp
+ identityManager.getCachedPeerFingerprint(peerID)?.let { return it }
+ identityManager.getCachedNoiseKey(peerID)?.let { noiseHex ->
+ identityManager.getCachedNoiseFingerprint(noiseHex)?.let { return it }
+ return fingerprintFromNoiseHex(noiseHex)?.also { identityManager.cacheNoiseFingerprint(noiseHex, it) }
+ }
+ val favorite = try {
+ FavoritesPersistenceService.shared.getFavoriteStatus(peerID)
+ } catch (_: Exception) {
+ null
+ }
+ favorite?.peerNoisePublicKey?.let { fingerprintFromNoiseBytes(it) }
+ }
+ peerID.startsWith("nostr_") -> {
+ val pubHex = GeohashAliasRegistry.get(peerID)
+ val noiseKey = pubHex?.let {
+ FavoritesPersistenceService.shared.findNoiseKey(it)
+ }
+ noiseKey?.let {
+ val noiseHex = it.hexEncodedString()
+ identityManager.getCachedNoiseFingerprint(noiseHex) ?: fingerprintFromNoiseBytes(it)
+ }
+ }
+ peerID.startsWith("nostr:") -> {
+ val prefix = peerID.removePrefix("nostr:").lowercase()
+ val pubHex = GeohashAliasRegistry
+ .snapshot()
+ .values
+ .firstOrNull { it.lowercase().startsWith(prefix) }
+ val noiseKey = pubHex?.let {
+ FavoritesPersistenceService.shared.findNoiseKey(it)
+ }
+ noiseKey?.let {
+ val noiseHex = it.hexEncodedString()
+ identityManager.getCachedNoiseFingerprint(noiseHex) ?: fingerprintFromNoiseBytes(it)
+ }
+ }
+ else -> {
+ val meshFp = meshService.getPeerFingerprint(peerID)
+ if (meshFp != null) return meshFp
+ identityManager.getCachedPeerFingerprint(peerID)?.let { return it }
+ identityManager.getCachedNoiseKey(peerID)?.let { noiseHex ->
+ identityManager.getCachedNoiseFingerprint(noiseHex)?.let { return it }
+ return fingerprintFromNoiseHex(noiseHex)?.also { identityManager.cacheNoiseFingerprint(noiseHex, it) }
+ }
+ val favorite = try {
+ FavoritesPersistenceService.shared.getFavoriteStatus(peerID)
+ } catch (_: Exception) {
+ null
+ }
+ favorite?.peerNoisePublicKey?.let { fingerprintFromNoiseBytes(it) }
+ }
+ }
+ } catch (_: Exception) {
+ null
+ }
+ }
+
+ fun resolvePeerDisplayNameForFingerprint(peerID: String): String {
+ val nicknameMap = state.peerNicknames.value
+ nicknameMap[peerID]?.let { return it }
+ try {
+ meshService.getPeerInfo(peerID)?.nickname?.let { return it }
+ } catch (_: Exception) { }
+
+ val fingerprint = getPeerFingerprintForDisplay(peerID)
+ fingerprint?.let { fp ->
+ identityManager.getCachedFingerprintNickname(fp)?.let { cached ->
+ if (cached.isNotBlank()) return cached
+ }
+ }
+
+ val hexRegex = Regex("^[0-9a-fA-F]+$")
+ if (peerID.length == 64 && peerID.matches(hexRegex)) {
+ val noiseKeyBytes = try {
+ peerID.chunked(2).map { it.toInt(16).toByte() }.toByteArray()
+ } catch (_: Exception) { null }
+ val favorite = noiseKeyBytes?.let {
+ FavoritesPersistenceService.shared.getFavoriteStatus(it)
+ }
+ favorite?.peerNickname?.takeIf { it.isNotBlank() }?.let { return it }
+ }
+
+ if (peerID.length == 16 && peerID.matches(hexRegex)) {
+ val favorite = try {
+ FavoritesPersistenceService.shared.getFavoriteStatus(peerID)
+ } catch (_: Exception) {
+ null
+ }
+ favorite?.peerNickname?.takeIf { it.isNotBlank() }?.let { return it }
+ }
+
+ return peerID.take(8)
+ }
+
+ fun getMyFingerprint(): String {
+ return meshService.getIdentityFingerprint()
+ }
+
+ fun verifyFingerprintValue(fingerprint: String) {
+ if (fingerprint.isBlank()) return
+ identityManager.setVerifiedFingerprint(fingerprint, true)
+ val current = _verifiedFingerprints.value.toMutableSet()
+ current.add(fingerprint)
+ _verifiedFingerprints.value = current
+ }
+
+ fun unverifyFingerprintValue(fingerprint: String) {
+ if (fingerprint.isBlank()) return
+ identityManager.setVerifiedFingerprint(fingerprint, false)
+ val current = _verifiedFingerprints.value.toMutableSet()
+ current.remove(fingerprint)
+ _verifiedFingerprints.value = current
+ }
+
+ private fun addVerificationSystemMessage(peerID: String, text: String) {
+ val msg = BitchatMessage(
+ sender = "system",
+ content = text,
+ timestamp = Date(),
+ isRelay = false,
+ isPrivate = true,
+ senderPeerID = peerID
+ )
+ messageManager.addPrivateMessageNoUnread(peerID, msg)
+ }
+
+ private fun resolvePeerDisplayName(peerID: String): String {
+ val nick = try { meshService.getPeerInfo(peerID)?.nickname } catch (_: Exception) { null }
+ return nick ?: peerID.take(8)
+ }
+
+ private fun sendVerificationNotification(title: String, body: String, peerID: String) {
+ notificationManager.showVerificationNotification(title, body, peerID)
+ }
+
+ private fun fingerprintFromNoiseHex(noiseHex: String): String? {
+ val bytes = noiseHex.dataFromHexString() ?: return null
+ return fingerprintFromNoiseBytes(bytes)
+ }
+
+ fun fingerprintFromNoiseBytes(bytes: ByteArray): String {
+ val hash = MessageDigest.getInstance("SHA-256").digest(bytes)
+ return hash.hexEncodedString()
+ }
+
+ private data class PendingVerification(
+ val noiseKeyHex: String,
+ val signKeyHex: String,
+ val nonceA: ByteArray,
+ val startedAtMs: Long,
+ val sent: Boolean
+ ) {
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as PendingVerification
+
+ if (startedAtMs != other.startedAtMs) return false
+ if (sent != other.sent) return false
+ if (noiseKeyHex != other.noiseKeyHex) return false
+ if (signKeyHex != other.signKeyHex) return false
+ if (!nonceA.contentEquals(other.nonceA)) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startedAtMs.hashCode()
+ result = 31 * result + sent.hashCode()
+ result = 31 * result + noiseKeyHex.hashCode()
+ result = 31 * result + signKeyHex.hashCode()
+ result = 31 * result + nonceA.contentHashCode()
+ return result
+ }
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/ui/VerificationSheet.kt b/app/src/main/java/com/bitchat/android/ui/VerificationSheet.kt
new file mode 100644
index 00000000..896a66c1
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/ui/VerificationSheet.kt
@@ -0,0 +1,496 @@
+package com.bitchat.android.ui
+
+import android.graphics.Bitmap
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import androidx.camera.compose.CameraXViewfinder
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ExperimentalGetImage
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageProxy
+import androidx.camera.core.Preview
+import androidx.camera.core.SurfaceRequest
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.viewfinder.core.ImplementationMode
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.QrCode
+import androidx.compose.material.icons.outlined.QrCodeScanner
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.createBitmap
+import androidx.core.graphics.set
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.bitchat.android.R
+import com.bitchat.android.services.VerificationService
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.google.mlkit.vision.barcode.BarcodeScannerOptions
+import com.google.mlkit.vision.barcode.BarcodeScanning
+import com.google.mlkit.vision.barcode.common.Barcode
+import com.google.mlkit.vision.common.InputImage
+import kotlinx.coroutines.flow.MutableStateFlow
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.common.BitMatrix
+import com.google.zxing.qrcode.QRCodeWriter
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun VerificationSheet(
+ isPresented: Boolean,
+ onDismiss: () -> Unit,
+ viewModel: ChatViewModel,
+ modifier: Modifier = Modifier
+) {
+ if (!isPresented) return
+
+ val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+ val isDark = isSystemInDarkTheme()
+ val accent = if (isDark) Color.Green else Color(0xFF008000)
+ val boxColor = if (isDark) Color.White.copy(alpha = 0.06f) else Color.Black.copy(alpha = 0.06f)
+
+ var showingScanner by remember { mutableStateOf(false) }
+ val nickname by viewModel.nickname.collectAsStateWithLifecycle()
+ val npub = remember {
+ viewModel.getCurrentNpub()
+ }
+
+
+ val qrString = remember(nickname, npub) {
+ viewModel.buildMyQRString(nickname, npub)
+ }
+
+ ModalBottomSheet(
+ modifier = modifier.statusBarsPadding(),
+ onDismissRequest = onDismiss,
+ sheetState = sheetState,
+ containerColor = MaterialTheme.colorScheme.background,
+ dragHandle = null
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(horizontal = 16.dp, vertical = 12.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ VerificationHeader(
+ accent = accent,
+ onClose = onDismiss
+ )
+
+ Box(
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth()
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .verticalScroll(rememberScrollState()),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ if (showingScanner) {
+ QRScannerPanel(
+ accent = accent,
+ boxColor = boxColor,
+ onScan = { code ->
+ val qr = VerificationService.verifyScannedQR(code)
+ if (qr != null && viewModel.beginQRVerification(qr)) {
+ showingScanner = false
+ }
+ }
+ )
+ } else {
+ MyQrPanel(
+ qrString = qrString,
+ accent = accent,
+ boxColor = boxColor,
+ )
+ }
+ }
+ }
+
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(10.dp)
+ ) {
+ ToggleVerificationModeButton(
+ showingScanner = showingScanner,
+ onToggle = { showingScanner = !showingScanner }
+ )
+
+ val peerID by viewModel.selectedPrivateChatPeer.collectAsStateWithLifecycle()
+ val fingerprints by viewModel.verifiedFingerprints.collectAsStateWithLifecycle()
+ if (peerID != null) {
+ val fingerprint = viewModel.meshService.getPeerFingerprint(peerID!!)
+ if (fingerprint != null && fingerprints.contains(fingerprint)) {
+ Button(
+ onClick = { viewModel.unverifyFingerprint(peerID!!) },
+ colors = ButtonDefaults.buttonColors(
+ containerColor = MaterialTheme.colorScheme.secondary.copy(alpha = 0.12f),
+ contentColor = MaterialTheme.colorScheme.onSurface
+ ),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text(
+ text = stringResource(R.string.verify_remove),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 12.sp
+ )
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun VerificationHeader(
+ accent: Color,
+ onClose: () -> Unit
+) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = stringResource(R.string.verify_title).uppercase(),
+ fontSize = 14.sp,
+ fontFamily = FontFamily.Monospace,
+ color = accent
+ )
+ CloseButton(onClick = onClose)
+ }
+}
+
+@Composable
+private fun MyQrPanel(
+ qrString: String,
+ accent: Color,
+ boxColor: Color,
+) {
+ Text(
+ text = stringResource(R.string.verify_my_qr_title),
+ fontSize = 16.sp,
+ fontFamily = FontFamily.Monospace,
+ color = accent,
+ modifier = Modifier.fillMaxWidth(),
+ textAlign = TextAlign.Center
+ )
+
+ QRCodeCard(qrString = qrString, boxColor = boxColor)
+}
+
+@Composable
+private fun ToggleVerificationModeButton(
+ showingScanner: Boolean,
+ onToggle: () -> Unit
+) {
+ Button(
+ onClick = onToggle,
+ colors = ButtonDefaults.buttonColors(
+ containerColor = MaterialTheme.colorScheme.secondary.copy(alpha = 0.12f),
+ contentColor = MaterialTheme.colorScheme.onSurface
+ ),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ if (showingScanner) {
+ Icon(
+ imageVector = Icons.Outlined.QrCode,
+ contentDescription = null,
+ modifier = Modifier.size(16.dp)
+ )
+ Spacer(modifier = Modifier.size(8.dp))
+ Text(
+ text = stringResource(R.string.verify_show_my_qr),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 13.sp
+ )
+ } else {
+ Icon(
+ imageVector = Icons.Outlined.QrCodeScanner,
+ contentDescription = null,
+ modifier = Modifier.size(16.dp)
+ )
+ Spacer(modifier = Modifier.size(8.dp))
+ Text(
+ text = stringResource(R.string.verify_scan_someone),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 13.sp
+ )
+ }
+ }
+}
+
+@Composable
+private fun QRCodeCard(qrString: String, boxColor: Color) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .background(boxColor, RoundedCornerShape(12.dp))
+ .padding(12.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ if (qrString.isNotBlank()) {
+ QRCodeImage(data = qrString, size = 220.dp)
+ } else {
+ Box(
+ modifier = Modifier
+ .size(220.dp)
+ .background(Color.Transparent, RoundedCornerShape(8.dp)),
+ contentAlignment = Alignment.Center
+ ) {
+ Text(
+ text = stringResource(R.string.verify_qr_unavailable),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 12.sp,
+ color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
+ )
+ }
+ }
+
+ SelectionContainer {
+ Text(
+ text = qrString,
+ fontFamily = FontFamily.Monospace,
+ fontSize = 11.sp,
+ color = MaterialTheme.colorScheme.onSurface
+ )
+ }
+ }
+}
+
+@Composable
+private fun QRCodeImage(data: String, size: Dp) {
+ val sizePx = with(LocalDensity.current) { size.toPx().toInt() }
+ val bitmap = remember(data, sizePx) { generateQrBitmap(data, sizePx) }
+ if (bitmap != null) {
+ Image(
+ bitmap = bitmap.asImageBitmap(),
+ contentDescription = null,
+ modifier = Modifier.size(size)
+ )
+ }
+}
+
+private fun generateQrBitmap(data: String, sizePx: Int): Bitmap? {
+ if (data.isBlank() || sizePx <= 0) return null
+ return try {
+ val matrix = QRCodeWriter().encode(data, BarcodeFormat.QR_CODE, sizePx, sizePx)
+ bitmapFromMatrix(matrix)
+ } catch (_: Exception) {
+ null
+ }
+}
+
+private fun bitmapFromMatrix(matrix: BitMatrix): Bitmap {
+ val width = matrix.width
+ val height = matrix.height
+ val bitmap = createBitmap(width, height)
+ for (x in 0 until width) {
+ for (y in 0 until height) {
+ bitmap[x, y] =
+ if (matrix[x, y]) android.graphics.Color.BLACK else android.graphics.Color.WHITE
+ }
+ }
+ return bitmap
+}
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+private fun QRScannerPanel(
+ onScan: (String) -> Unit,
+ accent: Color,
+ boxColor: Color,
+ modifier: Modifier = Modifier
+) {
+ val permissionState = rememberPermissionState(android.Manifest.permission.CAMERA)
+ val context = LocalContext.current
+ val lifecycleOwner = LocalLifecycleOwner.current
+ var lastValid by remember { mutableStateOf(null) }
+ val cameraProviderFuture = remember { ProcessCameraProvider.getInstance(context) }
+ val cameraExecutor: ExecutorService = remember { Executors.newSingleThreadExecutor() }
+ val surfaceRequests = remember { MutableStateFlow(null) }
+ val surfaceRequest by surfaceRequests.collectAsState(initial = null)
+ val mainHandler = remember { Handler(Looper.getMainLooper()) }
+
+ val onCodeState = rememberUpdatedState(onScan)
+ val analyzer = remember {
+ QRCodeAnalyzer { text ->
+ mainHandler.post {
+ if (text == lastValid) return@post
+ lastValid = text
+ onCodeState.value(text)
+ }
+ }
+ }
+
+ DisposableEffect(permissionState.status.isGranted) {
+ var cameraProvider: ProcessCameraProvider? = null
+ if (permissionState.status.isGranted) {
+ val executor = ContextCompat.getMainExecutor(context)
+ cameraProviderFuture.addListener(
+ {
+ val provider = cameraProviderFuture.get()
+ cameraProvider = provider
+ val preview = Preview.Builder()
+ .build()
+ .also { it.setSurfaceProvider { request -> surfaceRequests.value = request } }
+ val analysis = ImageAnalysis.Builder()
+ .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
+ .build()
+ .also { it.setAnalyzer(cameraExecutor, analyzer) }
+
+ runCatching {
+ provider.unbindAll()
+ provider.bindToLifecycle(
+ lifecycleOwner,
+ CameraSelector.DEFAULT_BACK_CAMERA,
+ preview,
+ analysis
+ )
+ }.onFailure {
+ Log.w("VerificationSheet", "Failed to bind camera: ${it.message}")
+ }
+ },
+ executor
+ )
+ }
+
+ onDispose {
+ surfaceRequests.value = null
+ runCatching { cameraProvider?.unbindAll() }
+ }
+ }
+
+ DisposableEffect(Unit) {
+ onDispose { cameraExecutor.shutdown() }
+ }
+
+ Column(
+ modifier = modifier
+ .fillMaxWidth()
+ .background(boxColor, RoundedCornerShape(12.dp))
+ .padding(12.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text(
+ text = stringResource(R.string.verify_scan_prompt_friend),
+ fontSize = 16.sp,
+ fontFamily = FontFamily.Monospace,
+ color = accent,
+ modifier = Modifier.fillMaxWidth(),
+ textAlign = TextAlign.Center
+ )
+
+ if (permissionState.status.isGranted) {
+ surfaceRequest?.let { request ->
+ CameraXViewfinder(
+ surfaceRequest = request,
+ implementationMode = ImplementationMode.EMBEDDED,
+ modifier = Modifier
+ .size(220.dp)
+ .clipToBounds()
+ )
+ }
+ } else {
+ Text(
+ text = stringResource(R.string.verify_camera_permission),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 12.sp,
+ color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f)
+ )
+ Button(
+ onClick = { permissionState.launchPermissionRequest() },
+ colors = ButtonDefaults.buttonColors(
+ containerColor = MaterialTheme.colorScheme.secondary.copy(alpha = 0.12f),
+ contentColor = MaterialTheme.colorScheme.onSurface
+ )
+ ) {
+ Text(
+ text = stringResource(R.string.verify_request_camera),
+ fontFamily = FontFamily.Monospace,
+ fontSize = 12.sp
+ )
+ }
+ }
+ }
+}
+
+private class QRCodeAnalyzer(
+ private val onCode: (String) -> Unit
+) : ImageAnalysis.Analyzer {
+ private val scanner = BarcodeScanning.getClient(
+ BarcodeScannerOptions.Builder()
+ .setBarcodeFormats(Barcode.FORMAT_QR_CODE)
+ .build()
+ )
+
+ @ExperimentalGetImage
+ override fun analyze(imageProxy: ImageProxy) {
+ val mediaImage = imageProxy.image ?: run {
+ imageProxy.close()
+ return
+ }
+ val input = InputImage.fromMediaImage(mediaImage, imageProxy.imageInfo.rotationDegrees)
+ scanner.process(input)
+ .addOnSuccessListener { barcodes ->
+ val text = barcodes.firstOrNull()?.rawValue
+ if (!text.isNullOrBlank()) onCode(text)
+ }
+ .addOnCompleteListener { imageProxy.close() }
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/util/AppConstants.kt b/app/src/main/java/com/bitchat/android/util/AppConstants.kt
index ca031df9..0e6a84f0 100644
--- a/app/src/main/java/com/bitchat/android/util/AppConstants.kt
+++ b/app/src/main/java/com/bitchat/android/util/AppConstants.kt
@@ -58,6 +58,10 @@ object AppConstants {
const val HIGH_NONCE_WARNING_THRESHOLD: Long = 1_000_000_000L
}
+ object Verification {
+ const val QR_MAX_AGE_SECONDS: Long = 300L // 5 minutes
+ }
+
object Protocol {
const val COMPRESSION_THRESHOLD_BYTES: Int = 100
}
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 3f6d7ddf..7ddae251 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -363,4 +363,40 @@
إغلاق
أضف ملاحظة لهذا المكان
الشبكة تعمل — %1$d أقران
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 9948b452..24f94630 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -350,4 +350,40 @@
মেশ চলছে — %1$d পিয়ার
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 84eb0fd4..c02bbb37 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -70,7 +70,7 @@
Aus Favoriten entfernen
Lesezeichen hinzufügen
-
+
zurück
Kanal: %1$s
verlassen
@@ -170,7 +170,7 @@
Online‑Geohash‑Kanäle
Ende‑zu‑Ende‑Verschlüsselung
-
+
Bild %1$d von %2$d
Bild nicht verfügbar
Bild in "Downloads" gespeichert
@@ -364,4 +364,40 @@
schließen
füge eine Notiz zu diesem Ort hinzu
Mesh läuft — %1$d Peers
+
+ verifizieren
+ scannen zur verifizierung
+ anderen qr scannen
+ anderen qr scannen
+ mein qr zeigen
+ verifizierung entfernen
+ qr nicht verfügbar
+ kamera-berechtigung nötig
+ kamera aktivieren
+ verifizierungs-url einfügen
+ validieren
+ verifizierung angefordert
+ sicherheitsüberprüfung
+ ihr fingerabdruck
+ dein fingerabdruck
+ handshake ausstehend
+ privatchat öffnen
+ verschlüsselt & verifiziert
+ verschlüsselt
+ handshake
+ handshake fehlgeschlagen
+ unverschlüsselt
+ verifiziert
+ du hast diese person verifiziert.
+ nicht verifiziert
+ vergleiche fingerabdrücke mit %1$s.
+ als verifiziert markieren
+ handshake starten
+ kopieren
+ Gegenseitige Verifizierung
+ Du und %1$s habt euch verifiziert
+ gegenseitige verifizierung mit %1$s
+ Verifiziert
+ Du hast %1$s verifiziert
+ verifiziert %1$s
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b72bfdf3..eae48a0e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -363,4 +363,40 @@
cerrar
agrega una nota para este lugar
Mesh en ejecución — %1$d pares
+
+ verificar
+ escanear para verificarme
+ escanear qr de otro
+ escanear qr de otro
+ mostrar mi qr
+ eliminar verificación
+ qr no disponible
+ se necesita permiso de cámara
+ activar cámara
+ pegar url de verificación
+ validar
+ verificación solicitada
+ verificación de seguridad
+ su huella digital
+ tu huella digital
+ intercambio pendiente
+ abrir chat privado para ver
+ cifrado y verificado
+ cifrado
+ negociando
+ falló negociación
+ no cifrado
+ verificado
+ has verificado esta identidad.
+ no verificado
+ compara huellas con %1$s por canal seguro.
+ marcar verificado
+ iniciar handshake
+ copiar
+ Verificación mutua
+ Tú y %1$s se verificaron
+ verificación mutua con %1$s
+ Verificado
+ Verificaste a %1$s
+ verificado %1$s
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 4007cf1a..1473c5fd 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -350,4 +350,40 @@
مش در حال اجرا — %1$d همتا
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index b89824d6..0a7dc2e3 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -363,4 +363,40 @@
Tumatakbo ang Mesh — %1$d na peer
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e0e7c7eb..01f480d2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -70,7 +70,7 @@
Retirer des favoris
Ajouter un signet
-
+
retour
canal : %1$s
quitter
@@ -165,7 +165,7 @@
Canaux Geohash en ligne
Chiffrement de bout en bout
-
+
Image %1$d sur %2$d
Image indisponible
Image enregistrée dans "Téléchargements"
@@ -377,4 +377,40 @@
fermer
ajoutez une note pour cet endroit
Mesh actif — %1$d pairs
+
+ vérifier
+ scanner pour me vérifier
+ scanner un autre qr
+ scanner un autre qr
+ afficher mon qr
+ supprimer la vérification
+ qr indisponible
+ permission caméra requise
+ activer caméra
+ coller url de vérification
+ valider
+ vérification demandée
+ vérification de sécurité
+ leur empreinte
+ votre empreinte
+ négociation en cours
+ ouvrir un chat privé
+ chiffré & vérifié
+ chiffré
+ négociation
+ échec négociation
+ non chiffré
+ vérifié
+ vous avez vérifié cette personne.
+ non vérifié
+ comparez avec %1$s via canal sûr.
+ marquer vérifié
+ lancer handshake
+ copier
+ Vérification mutuelle
+ Vous et %1$s êtes vérifiés
+ vérification mutuelle avec %1$s
+ Vérifié
+ Vous avez vérifié %1$s
+ vérifié %1$s
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 059924d4..deb22711 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -15,5 +15,41 @@
סגור
הוסף הערה למקום זה
רשת Mesh פועלת — %1$d עמיתים
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 780015b0..acaa54b6 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -70,7 +70,7 @@
पसंदीदा से हटाएँ
बुकमार्क जोड़ें
-
+
वापस
चैनल: %1$s
छोड़ें
@@ -363,4 +363,40 @@
बंद करें
इस स्थान के लिए एक नोट जोड़ें
मेश चल रहा है — %1$d पीयर्स
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 744a499c..18c85a5b 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -70,7 +70,7 @@
Hapus dari favorit
Tambah bookmark
-
+
kembali
Channel: %1$s
keluar
@@ -170,7 +170,7 @@
Channel Geohash Online
Enkripsi end-to-end
-
+
Gambar %1$d dari %2$d
Gambar tidak tersedia
Gambar disimpan ke \"Downloads\"
@@ -363,4 +363,40 @@
tutup
tambahkan catatan untuk tempat ini
Mesh berjalan — %1$d peer
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 185dfa3f..07fb5a76 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -397,4 +397,40 @@
chiudi
aggiungi una nota per questo luogo
Mesh in esecuzione — %1$d peer
+
+ verifica
+ scansiona per verificarmi
+ scansiona qr altrui
+ scansiona qr altrui
+ mostra mio qr
+ rimuovi verifica
+ qr non disponibile
+ permesso fotocamera necessario
+ abilita fotocamera
+ incolla url verifica
+ convalida
+ verifica richiesta
+ verifica sicurezza
+ loro impronta
+ tua impronta
+ handshake in corso
+ apri chat privata
+ criptato & verificato
+ criptato
+ handshake
+ handshake fallito
+ non criptato
+ verificato
+ hai verificato questa persona.
+ non verificato
+ confronta con %1$s via canale sicuro.
+ segna verificato
+ avvia handshake
+ copia
+ Verifica reciproca
+ Tu e %1$s vi siete verificati
+ verifica reciproca con %1$s
+ Verificato
+ Hai verificato %1$s
+ verificato %1$s
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7d8f530f..f9c4fd64 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -70,7 +70,7 @@
お気に入りから削除
ブックマークに追加
-
+
戻る
チャンネル: %1$s
退出
@@ -170,7 +170,7 @@
オンライン Geohash チャンネル
エンドツーエンド暗号化
-
+
画像 %1$d / %2$d
画像は利用できません
画像を「ダウンロード」に保存しました
@@ -363,4 +363,40 @@
閉じる
この場所へのメモを追加
メッシュ実行中 — %1$d ピア
+
+ 検証
+ 私を検証するためにスキャン
+ 他人のQRをスキャン
+ 他人のQRをスキャン
+ QRコードを表示
+ 検証を削除
+ QR利用不可
+ QRスキャンにカメラ権限が必要です
+ カメラを有効化
+ 検証URLを貼り付け
+ 検証する
+ 検証をリクエストしました
+ セキュリティ検証
+ 相手の指紋
+ あなたの指紋
+ ハンドシェイク保留中
+ 指紋を見るにはプライベートチャットを開いてください
+ 暗号化＆検証済み
+ 暗号化済み
+ ハンドシェイク中
+ ハンドシェイク失敗
+ 未暗号化
+ 検証済み
+ この人物の身元を検証しました。
+ 未検証
+ 安全な経路で %1$s と指紋を比較してください。
+ 検証済みにする
+ ハンドシェイク開始
+ コピー
+ 相互検証
+ あなたと %1$s は相互に検証しました
+ %1$s と相互検証しました
+ 検証済み
+ %1$s を検証しました
+ %1$s を検証しました
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 7c999d96..db24c8a9 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -70,7 +70,7 @@
რჩეულებიდან წაშლა
სანიშნეს დამატება
-
+
უკან
არხი: %1$s
გასვლა
@@ -170,7 +170,7 @@
ონლაინ geohash არხები
ბოლო-მდე დაშიფვრა
-
+
სურათი %1$d %2$d-დან
სურათი მიუწვდომელია
სურათი შენახულია "ჩამოტვირთვებში"
@@ -350,4 +350,40 @@
Mesh გაშვებულია — %1$d პირები
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bf9b6d53..0510fb7d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -70,7 +70,7 @@
즐겨찾기에서 제거
북마크 추가
-
+
뒤로
채널: %1$s
나가기
@@ -170,7 +170,7 @@
온라인 geohash 채널
종단간 암호화
-
+
이미지 %1$d / %2$d
이미지를 사용할 수 없음
이미지가 \"Downloads\"에 저장됨
@@ -363,4 +363,40 @@
닫기
이 장소에 노트 추가
메시 실행 중 — %1$d 피어
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-mg/strings.xml b/app/src/main/res/values-mg/strings.xml
index 4bed7bc0..5fc53577 100644
--- a/app/src/main/res/values-mg/strings.xml
+++ b/app/src/main/res/values-mg/strings.xml
@@ -70,7 +70,7 @@
Hanesorana amin\'ny ankafizina
Hanampy bookmark
-
+
miverina
fantsona: %1$s
hiala
@@ -170,7 +170,7 @@
Fantsona Geohash an-tserasera
Fandokoana Farany amin\'ny Farany
-
+
Sary %1$d amin\'ny %2$d
Tsy misy sary
Sary voatahiry ao amin\'ny Downloads
@@ -377,4 +377,40 @@
Mandeha ny Mesh — %1$d peers
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 5027aade..0e6dd945 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -2,5 +2,41 @@
Mesh sedang berjalan — %1$d rakan
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index bae76cf0..6632f0dc 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -363,4 +363,40 @@
मेश चलिरहेको छ — %1$d पियर्स
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 40fdf86b..7d19b52a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -70,7 +70,7 @@
Verwijderen uit favorieten
Bladwijzer toevoegen
-
+
terug
kanaal: %1$s
verlaten
@@ -170,7 +170,7 @@
Online geohash-kanalen
End-to-end-versleuteling
-
+
Afbeelding %1$d van %2$d
Afbeelding niet beschikbaar
Afbeelding opgeslagen in Downloads
@@ -338,7 +338,7 @@
Deelnemen
Annuleren
-
+
@
bitchat/
· ⧉
@@ -395,4 +395,40 @@
sluiten
voeg een notitie toe voor deze plek
Mesh actief — %1$d peers
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 80ea2b84..3f08aa32 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -70,7 +70,7 @@
پسندیدہ توں ہٹاؤ
بُک مارک پاؤ
-
+
واپس
چینل: %1$s
باہر آؤ
@@ -170,7 +170,7 @@
آن لائن geohash چینل
اینڈ ٹو اینڈ انکرپشن
-
+
تصویر %1$d وچوں %2$d
تصویر دستیاب نئیں
تصویر \"Downloads\" وچ سیو ہو گئی
@@ -350,4 +350,40 @@
میش چل رہا ہے — %1$d ساتھی
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index daa016d6..56cd087a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -15,5 +15,41 @@
zamknij
dodaj notatkę dla tego miejsca
Mesh działa — %1$d peerów
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d736dd39..e9686f99 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -70,7 +70,7 @@
Remover dos favoritos
Adicionar favorito
-
+
voltar
Canal: %1$s
sair
@@ -170,7 +170,7 @@
Canais geohash online
Criptografia de ponta a ponta
-
+
Imagem %1$d de %2$d
Imagem indisponível
Imagem salva em "Downloads"
@@ -363,4 +363,40 @@
fechar
adicione uma nota para este local
Mesh rodando — %1$d pares
+
+ verificar
+ digitalize para verificar-me
+ digitalizar outro qr
+ digitalizar outro qr
+ mostrar meu qr
+ remover verificação
+ qr indisponível
+ permissão de câmera necessária
+ ativar câmera
+ colar url de verificação
+ validar
+ verificação solicitada
+ verificação de segurança
+ impressão digital deles
+ sua impressão digital
+ handshake pendente
+ abra chat privado para ver
+ criptografado e verificado
+ criptografado
+ handshake
+ falha no handshake
+ não criptografado
+ verificado
+ você verificou esta pessoa.
+ não verificado
+ compare com %1$s em canal seguro.
+ marcar verificado
+ iniciar handshake
+ copiar
+ Verificação mútua
+ Você e %1$s verificaram-se
+ verificação mútua com %1$s
+ Verificado
+ Você verificou %1$s
+ verificou %1$s
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 8e87c6e6..8f9baf72 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -363,4 +363,40 @@
fechar
adicione uma nota para este local
Mesh em execução — %1$d pares
+
+ verificar
+ digitalize para verificar-me
+ digitalizar outro qr
+ digitalizar outro qr
+ mostrar meu qr
+ remover verificação
+ qr indisponível
+ permissão de câmera necessária
+ ativar câmera
+ colar url de verificação
+ validar
+ verificação solicitada
+ verificação de segurança
+ impressão digital deles
+ sua impressão digital
+ handshake pendente
+ abra chat privado para ver
+ criptografado e verificado
+ criptografado
+ handshake
+ falha no handshake
+ não criptografado
+ verificado
+ você verificou esta pessoa.
+ não verificado
+ compare com %1$s em canal seguro.
+ marcar verificado
+ iniciar handshake
+ copiar
+ Verificação mútua
+ Você e %1$s verificaram-se
+ verificação mútua com %1$s
+ Verificado
+ Você verificou %1$s
+ verificou %1$s
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c6c3bd37..cad2a0d1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -353,4 +353,40 @@
закрыть
добавьте заметку для этого места
Mesh запущен — %1$d пиров
+
+ проверить
+ сканируй для проверки
+ сканировать чужой QR
+ сканировать чужой QR
+ показать мой QR
+ удалить проверку
+ QR недоступен
+ нужен доступ к камере
+ включить камеру
+ вставить URL проверки
+ проверить
+ запрос проверки
+ проверка безопасности
+ их отпечаток
+ ваш отпечаток
+ ожидание рукопожатия
+ откройте личный чат
+ шифровано и проверено
+ шифровано
+ рукопожатие
+ сбой рукопожатия
+ не шифровано
+ проверено
+ вы проверили этого человека.
+ не проверено
+ сравните с %1$s.
+ отметить проверенным
+ начать рукопожатие
+ копировать
+ Взаимная проверка
+ Вы и %1$s проверили друг друга
+ взаимная проверка с %1$s
+ Проверено
+ Вы проверили %1$s
+ проверен %1$s
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d461be4c..ef3307e3 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -351,4 +351,40 @@
stäng
lägg till en anteckning för den här platsen
Mesh körs — %1$d peers
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index c9e8943c..98ceef9c 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -2,5 +2,41 @@
மெஷ் இயங்குகிறது — %1$d பியர்ஸ்
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 9ae074c7..343f6885 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -70,7 +70,7 @@
เอาออกจากรายการโปรด
เพิ่มที่คั่นหน้า
-
+
กลับ
ช่อง: %1$s
ออก
@@ -170,7 +170,7 @@
ช่อง geohash ออนไลน์
การเข้ารหัสแบบปลายทางถึงปลายทาง
-
+
รูปภาพ %1$d จาก %2$d
ไม่สามารถใช้รูปภาพได้
บันทึกรูปภาพไว้ใน "ดาวน์โหลด" แล้ว
@@ -350,4 +350,40 @@
Mesh กำลังทำงาน — %1$d เพื่อน
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 291c9904..1209074c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -351,4 +351,40 @@
kapat
bu yer için bir not ekleyin
Mesh çalışıyor — %1$d eş
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 16914c6a..5545b546 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2,5 +2,41 @@
Mesh працює — %1$d пірів
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index b782115f..1626a041 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -363,4 +363,40 @@
بند کریں
اس جگہ کے لیے ایک نوٹ شامل کریں
میش چل رہا ہے — %1$d ساتھی
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ec726fc9..afc227b6 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -70,7 +70,7 @@
Xóa khỏi yêu thích
Thêm bookmark
-
+
quay lại
Kênh: %1$s
rời khỏi
@@ -170,7 +170,7 @@
Kênh Geohash trực tuyến
Mã hóa đầu cuối
-
+
Hình ảnh %1$d trong %2$d
Hình ảnh không có sẵn
Hình ảnh đã lưu vào \"Downloads\"
@@ -350,4 +350,40 @@
Mesh đang chạy — %1$d ngang hàng
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b979b121..9f4b17d3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -15,5 +15,41 @@
关闭
为此地点添加一条笔记
Mesh 运行中 — %1$d 个节点
+
+ 验证
+ 扫描以验证我
+ 扫描他人的QR码
+ 扫描他人的QR码
+ 显示我的QR码
+ 移除验证
+ QR码不可用
+ 需要相机权限扫描QR码
+ 启用相机
+ 粘贴验证链接
+ 验证
+ 已请求验证
+ 安全验证
+ 对方指纹
+ 你的指纹
+ 握手中
+ 打开私聊查看指纹
+ 已加密且已验证
+ 已加密
+ 握手中
+ 握手失败
+ 未加密
+ 已验证
+ 你已验证此人身份。
+ 未验证
+ 请通过安全渠道与 %1$s 比对指纹。
+ 标记为已验证
+ 开始握手
+ 复制
+ 相互验证
+ 你和 %1$s 已相互验证
+ 与 %1$s 相互验证
+ 已验证
+ 你已验证 %1$s
+ 已验证 %1$s
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 7be4525f..a347d5b0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -15,5 +15,41 @@
關閉
為此地點新增一則筆記
Mesh 運行中 — %1$d 個節點
+
+ 验证
+ 扫描以验证我
+ 扫描他人的QR码
+ 扫描他人的QR码
+ 显示我的QR码
+ 移除验证
+ QR码不可用
+ 需要相机权限扫描QR码
+ 启用相机
+ 粘贴验证链接
+ 验证
+ 已请求验证
+ 安全验证
+ 对方指纹
+ 你的指纹
+ 握手中
+ 打开私聊查看指纹
+ 已加密且已验证
+ 已加密
+ 握手中
+ 握手失败
+ 未加密
+ 已验证
+ 你已验证此人身份。
+ 未验证
+ 请通过安全渠道与 %1$s 比对指纹。
+ 标记为已验证
+ 开始握手
+ 复制
+ 相互验证
+ 你和 %1$s 已相互验证
+ 与 %1$s 相互验证
+ 已验证
+ 你已验证 %1$s
+ 已验证 %1$s
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 17f53bbd..3a4a628f 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -376,4 +376,40 @@
关闭
为此地点添加一条笔记
Mesh 运行中 — %1$d 个节点
+
+ 验证
+ 扫描以验证我
+ 扫描他人的QR码
+ 扫描他人的QR码
+ 显示我的QR码
+ 移除验证
+ QR码不可用
+ 需要相机权限扫描QR码
+ 启用相机
+ 粘贴验证链接
+ 验证
+ 已请求验证
+ 安全验证
+ 对方指纹
+ 你的指纹
+ 握手中
+ 打开私聊查看指纹
+ 已加密且已验证
+ 已加密
+ 握手中
+ 握手失败
+ 未加密
+ 已验证
+ 你已验证此人身份。
+ 未验证
+ 请通过安全渠道与 %1$s 比对指纹。
+ 标记为已验证
+ 开始握手
+ 复制
+ 相互验证
+ 你和 %1$s 已相互验证
+ 与 %1$s 相互验证
+ 已验证
+ 你已验证 %1$s
+ 已验证 %1$s
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d85513de..6fe23b49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,7 +71,7 @@
Remove from favorites
Add bookmark
-
+
back
channel: %1$s
leave
@@ -265,6 +265,44 @@
none
disconnect
recent scan results
+
+ verify
+ scan to verify me
+ scan someone elses qr
+ scan someone elses qr
+ show my qr
+ remove verification
+ qr unavailable
+ camera permission is needed to scan qr codes
+ enable camera
+ paste verification url
+ validate
+ verification requested
+ security verification
+ their fingerprint
+ your fingerprint
+ handshake pending
+ open a private chat to view fingerprints
+ encrypted & verified
+ encrypted
+ handshaking
+ handshake failed
+ not encrypted
+ verified
+ you have verified this persons identity.
+ not verified
+ compare these fingerprints with %1$s using a secure channel.
+ mark as verified
+ start handshake
+ copy
+
+ Mutual verification
+ You and %1$s verified each other
+ mutual verification with %1$s
+ Verified
+ You verified %1$s
+ verified %1$s
+
connect
debug console
clear
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f7bfdd8a..2264de75 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -45,6 +45,13 @@ gms-location = "21.3.0"
# Security
security-crypto = "1.1.0-beta01"
+# QR
+zxing-core = "3.5.4"
+
+# CameraX / ML Kit
+camerax = "1.5.2"
+mlkit-barcode = "17.3.0"
+
# Testing
junit = "4.13.2"
androidx-test-ext = "1.2.1"
@@ -104,6 +111,15 @@ gms-location = { module = "com.google.android.gms:play-services-location", versi
# Security
androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "security-crypto" }
+# QR
+zxing-core = { module = "com.google.zxing:core", version.ref = "zxing-core" }
+
+# CameraX / ML Kit
+androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camerax" }
+androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camerax" }
+androidx-camera-compose = { module = "androidx.camera:camera-compose", version.ref = "camerax" }
+mlkit-barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version.ref = "mlkit-barcode" }
+
# Testing
junit = { module = "junit:junit", version.ref = "junit" }
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext" }