permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-26 05:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into gossip-routing-2

Browse Source
This commit is contained in:
callebtc
2025-09-21 08:43:04 +02:00
parent 69d18aae3c 2e4b0b04ed
commit 7a93bb073b
93 changed files with 7908 additions and 1618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt
+26
View File
@@ -16,6 +16,10 @@ object DebugPreferenceManager {
private const val KEY_MAX_CONN_OVERALL = "max_connections_overall"
private const val KEY_MAX_CONN_SERVER = "max_connections_server"
private const val KEY_MAX_CONN_CLIENT = "max_connections_client"
private const val KEY_SEEN_PACKET_CAP = "seen_packet_capacity"
// GCS keys (no migration/back-compat)
private const val KEY_GCS_MAX_BYTES = "gcs_max_filter_bytes"
private const val KEY_GCS_FPR = "gcs_filter_fpr_percent"
private lateinit var prefs: SharedPreferences
@@ -74,4 +78,26 @@ object DebugPreferenceManager {
fun setMaxConnectionsClient(value: Int) {
if (ready()) prefs.edit().putInt(KEY_MAX_CONN_CLIENT, value).apply()
}
// Sync/GCS settings
fun getSeenPacketCapacity(default: Int = 500): Int =
if (ready()) prefs.getInt(KEY_SEEN_PACKET_CAP, default) else default
fun setSeenPacketCapacity(value: Int) {
if (ready()) prefs.edit().putInt(KEY_SEEN_PACKET_CAP, value).apply()
}
fun getGcsMaxFilterBytes(default: Int = 400): Int =
if (ready()) prefs.getInt(KEY_GCS_MAX_BYTES, default) else default
fun setGcsMaxFilterBytes(value: Int) {
if (ready()) prefs.edit().putInt(KEY_GCS_MAX_BYTES, value).apply()
}
fun getGcsFprPercent(default: Double = 1.0): Double =
if (ready()) java.lang.Double.longBitsToDouble(prefs.getLong(KEY_GCS_FPR, java.lang.Double.doubleToRawLongBits(default))) else default
fun setGcsFprPercent(value: Double) {
if (ready()) prefs.edit().putLong(KEY_GCS_FPR, java.lang.Double.doubleToRawLongBits(value)).apply()
}
}
app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt
+54 -11
View File
@@ -201,6 +201,37 @@ class DebugSettingsManager private constructor() {
fun updateRelayStats(stats: PacketRelayStats) {
_relayStats.value = stats
}
// Sync/GCS settings (UI-configurable)
private val _seenPacketCapacity = MutableStateFlow(DebugPreferenceManager.getSeenPacketCapacity(500))
val seenPacketCapacity: StateFlow<Int> = _seenPacketCapacity.asStateFlow()
private val _gcsMaxBytes = MutableStateFlow(DebugPreferenceManager.getGcsMaxFilterBytes(400))
val gcsMaxBytes: StateFlow<Int> = _gcsMaxBytes.asStateFlow()
private val _gcsFprPercent = MutableStateFlow(DebugPreferenceManager.getGcsFprPercent(1.0))
val gcsFprPercent: StateFlow<Double> = _gcsFprPercent.asStateFlow()
fun setSeenPacketCapacity(value: Int) {
val clamped = value.coerceIn(10, 1000)
DebugPreferenceManager.setSeenPacketCapacity(clamped)
_seenPacketCapacity.value = clamped
addDebugMessage(DebugMessage.SystemMessage("🧩 max packets per sync set to $clamped"))
}
fun setGcsMaxBytes(value: Int) {
val clamped = value.coerceIn(128, 1024)
DebugPreferenceManager.setGcsMaxFilterBytes(clamped)
_gcsMaxBytes.value = clamped
addDebugMessage(DebugMessage.SystemMessage("🌸 max GCS filter size set to $clamped bytes"))
}
fun setGcsFprPercent(value: Double) {
val clamped = value.coerceIn(0.1, 5.0)
DebugPreferenceManager.setGcsFprPercent(clamped)
_gcsFprPercent.value = clamped
addDebugMessage(DebugMessage.SystemMessage("🎯 GCS FPR set to ${String.format("%.2f", clamped)}%"))
}
// MARK: - Debug Message Creation Helpers
@@ -226,11 +257,10 @@ class DebugSettingsManager private constructor() {
val who = if (!senderNickname.isNullOrBlank()) "$senderNickname ($senderPeerID)" else senderPeerID
val routeInfo = if (!viaDeviceId.isNullOrBlank()) " via $viaDeviceId" else " (direct)"
addDebugMessage(DebugMessage.PacketEvent(
"📥 Received $messageType from $who$routeInfo"
"📦 Received $messageType from $who$routeInfo"
))
}
}
fun logPacketRelay(
packetType: String,
originalPeerID: String,
@@ -248,9 +278,11 @@ class DebugSettingsManager private constructor() {
toPeerID = null,
toNickname = null,
toDeviceAddress = null,
ttl = null
ttl = null,
isRelay = true
)
}
// New, more detailed relay logger used by the mesh/broadcaster
fun logPacketRelayDetailed(
@@ -263,7 +295,8 @@ class DebugSettingsManager private constructor() {
toPeerID: String?,
toNickname: String?,
toDeviceAddress: String?,
ttl: UByte?
ttl: UByte?,
isRelay: Boolean = true
) {
// Build message only if verbose logging is enabled, but always update stats
val senderLabel = when {
@@ -288,16 +321,26 @@ class DebugSettingsManager private constructor() {
val ttlStr = ttl?.toString() ?: "?"
if (verboseLoggingEnabled.value) {
addDebugMessage(
DebugMessage.RelayEvent(
"♻️ Relayed $packetType by $senderLabel from $fromName (${fromPeerID ?: "?"}, $fromAddr) to $toName (${toPeerID ?: "?"}, $toAddr) with TTL $ttlStr"
if (isRelay) {
addDebugMessage(
DebugMessage.RelayEvent(
"♻️ Relayed $packetType by $senderLabel from $fromName (${fromPeerID ?: "?"}, $fromAddr) to $toName (${toPeerID ?: "?"}, $toAddr) with TTL $ttlStr"
)
)
)
} else {
addDebugMessage(
DebugMessage.PacketEvent(
"📤 Sent $packetType by $senderLabel to $toName (${toPeerID ?: "?"}, $toAddr) with TTL $ttlStr"
)
)
}
}
// Update rolling statistics
relayTimestamps.offer(System.currentTimeMillis())
updateRelayStatsFromTimestamps()
// Update rolling statistics only for relays
if (isRelay) {
relayTimestamps.offer(System.currentTimeMillis())
updateRelayStatsFromTimestamps()
}
}
// MARK: - Clear Data
app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt
+24
View File
@@ -133,6 +133,9 @@ fun DebugSettingsSheet(
val scanResults by manager.scanResults.collectAsState()
val connectedDevices by manager.connectedDevices.collectAsState()
val relayStats by manager.relayStats.collectAsState()
val seenCapacity by manager.seenPacketCapacity.collectAsState()
val gcsMaxBytes by manager.gcsMaxBytes.collectAsState()
val gcsFpr by manager.gcsFprPercent.collectAsState()
// Push live connected devices from mesh service whenever sheet is visible
LaunchedEffect(isPresented) {
@@ -417,6 +420,27 @@ fun MeshTopologySection() {
// Connected devices
item {
Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) {
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
Icon(Icons.Filled.SettingsEthernet, contentDescription = null, tint = Color(0xFF9C27B0))
Text("sync settings", fontFamily = FontFamily.Monospace, fontSize = 14.sp, fontWeight = FontWeight.Medium)
}
Text("max packets per sync: $seenCapacity", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.7f))
Slider(value = seenCapacity.toFloat(), onValueChange = { manager.setSeenPacketCapacity(it.toInt()) }, valueRange = 10f..1000f, steps = 99)
Text("max GCS filter size: $gcsMaxBytes bytes (128–1024)", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.7f))
Slider(value = gcsMaxBytes.toFloat(), onValueChange = { manager.setGcsMaxBytes(it.toInt()) }, valueRange = 128f..1024f, steps = 0)
Text("target FPR: ${String.format("%.2f", gcsFpr)}%", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.7f))
Slider(value = gcsFpr.toFloat(), onValueChange = { manager.setGcsFprPercent(it.toDouble()) }, valueRange = 0.1f..5.0f, steps = 49)
val p = remember(gcsFpr) { com.bitchat.android.sync.GCSFilter.deriveP(gcsFpr / 100.0) }
val nmax = remember(gcsFpr, gcsMaxBytes) { com.bitchat.android.sync.GCSFilter.estimateMaxElementsForSize(gcsMaxBytes, p) }
Text("derived P: $p • est. max elements: $nmax", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.7f))
}
}
}
// Connected devices
item {
Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) {