commit d6a4e122b4c134ae372e93a0a0a82abcaf4b9032
Author: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Tue Jul 8 20:37:46 2025 +0200
init
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..fcd3e1db
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,57 @@
+# Android Studio / IntelliJ
+.idea/
+*.iml
+build/
+!*/build/filtered-manifest/
+!*/build/generated/
+!*/build/intermediates/
+local.properties
+.gradle/
+captures/
+.externalNativeBuild/
+debug_keystore/
+*.keystore
+debug.keystore
+
+# Gradle
+/build/
+/.gradle/
+/captures/
+*.apk
+*.aab
+*.ap_
+*.dex
+
+# Mac
+.DS_Store
+*.swp
+*~
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+
+# Linters
+.lint/
+
+# Other
+*.log
+.cxx/
+*build/
+out/
+gen/
+*~
+*.swp
+*.lock
+
+# Google services
+google-services.json
+
+# Keystore files
+*.jks
+*.keystore
diff --git a/PRIVACY_POLICY.md b/PRIVACY_POLICY.md
new file mode 100644
index 00000000..792eb28b
--- /dev/null
+++ b/PRIVACY_POLICY.md
@@ -0,0 +1,139 @@
+# bitchat Privacy Policy
+
+*Last updated: January 2025*
+
+## Our Commitment
+
+bitchat is designed with privacy as its foundation. We believe private communication is a fundamental human right. This policy explains how bitchat protects your privacy.
+
+## Summary
+
+- **No personal data collection** - We don't collect names, emails, or phone numbers
+- **No servers** - Everything happens on your device and through peer-to-peer connections
+- **No tracking** - We have no analytics, telemetry, or user tracking
+- **Open source** - You can verify these claims by reading our code
+
+## What Information bitchat Stores
+
+### On Your Device Only
+
+1. **Identity Key**
+ - A cryptographic key generated on first launch
+ - Stored locally in your device's secure storage
+ - Allows you to maintain "favorite" relationships across app restarts
+ - Never leaves your device
+
+2. **Nickname**
+ - The display name you choose (or auto-generated)
+ - Stored only on your device
+ - Shared with peers you communicate with
+
+3. **Message History** (if enabled)
+ - When room owners enable retention, messages are saved locally
+ - Stored encrypted on your device
+ - You can delete this at any time
+
+4. **Favorite Peers**
+ - Public keys of peers you mark as favorites
+ - Stored only on your device
+ - Allows you to recognize these peers in future sessions
+
+### Temporary Session Data
+
+During each session, bitchat temporarily maintains:
+- Active peer connections (forgotten when app closes)
+- Routing information for message delivery
+- Cached messages for offline peers (12 hours max)
+
+## What Information is Shared
+
+### With Other bitchat Users
+
+When you use bitchat, nearby peers can see:
+- Your chosen nickname
+- Your ephemeral public key (changes each session)
+- Messages you send to public rooms or directly to them
+- Your approximate Bluetooth signal strength (for connection quality)
+
+### With Room Members
+
+When you join a password-protected room:
+- Your messages are visible to others with the password
+- Your nickname appears in the member list
+- Room owners can see you've joined
+
+## What We DON'T Do
+
+bitchat **never**:
+- Collects personal information
+- Tracks your location
+- Stores data on servers
+- Shares data with third parties
+- Uses analytics or telemetry
+- Creates user profiles
+- Requires registration
+
+## Encryption
+
+All private messages use end-to-end encryption:
+- **X25519** for key exchange
+- **AES-256-GCM** for message encryption
+- **Ed25519** for digital signatures
+- **Argon2id** for password-protected rooms
+
+## Your Rights
+
+You have complete control:
+- **Delete Everything**: Triple-tap the logo to instantly wipe all data
+- **Leave Anytime**: Close the app and your presence disappears
+- **No Account**: Nothing to delete from servers because there are none
+- **Portability**: Your data never leaves your device unless you export it
+
+## Bluetooth & Permissions
+
+bitchat requires Bluetooth permission to function:
+- Used only for peer-to-peer communication
+- No location data is accessed or stored
+- Bluetooth is not used for tracking
+- You can revoke this permission at any time in system settings
+
+## Children's Privacy
+
+bitchat does not knowingly collect information from children. The app has no age verification because it collects no personal information from anyone.
+
+## Data Retention
+
+- **Messages**: Deleted from memory when app closes (unless room retention is enabled)
+- **Identity Key**: Persists until you delete the app
+- **Favorites**: Persist until you remove them or delete the app
+- **Everything Else**: Exists only during active sessions
+
+## Security Measures
+
+- All communication is encrypted
+- No data transmitted to servers (there are none)
+- Open source code for public audit
+- Regular security updates
+- Cryptographic signatures prevent tampering
+
+## Changes to This Policy
+
+If we update this policy:
+- The "Last updated" date will change
+- The updated policy will be included in the app
+- No retroactive changes can affect data (since we don't collect any)
+
+## Contact
+
+bitchat is an open source project. For privacy questions:
+- Review our code: https://github.com/yourusername/bitchat
+- Open an issue on GitHub
+- Join the discussion in public rooms
+
+## Philosophy
+
+Privacy isn't just a feature—it's the entire point. bitchat proves that modern communication doesn't require surrendering your privacy. No accounts, no servers, no surveillance. Just people talking freely.
+
+---
+
+*This policy is released into the public domain under The Unlicense, just like bitchat itself.*
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..c102dcea
--- /dev/null
+++ b/README.md
@@ -0,0 +1,156 @@
+
+# bitchat
+
+A secure, decentralized, peer-to-peer messaging app that works over Bluetooth mesh networks. No internet required, no servers, no phone numbers - just pure encrypted communication.
+
+## License
+
+This project is released into the public domain. See the [LICENSE](LICENSE) file for details.
+
+## Features
+
+- **Decentralized Mesh Network**: Automatic peer discovery and multi-hop message relay over Bluetooth LE
+- **End-to-End Encryption**: X25519 key exchange + AES-256-GCM for private messages
+- **Channel-Based Chats**: Topic-based group messaging with optional password protection
+- **Store & Forward**: Messages cached for offline peers and delivered when they reconnect
+- **Privacy First**: No accounts, no phone numbers, no persistent identifiers
+- **IRC-Style Commands**: Familiar `/join`, `/msg`, `/who` style interface
+- **Message Retention**: Optional channel-wide message saving controlled by channel owners
+- **Universal App**: Native support for iOS and macOS
+- **Cover Traffic**: Timing obfuscation and dummy messages for enhanced privacy
+- **Emergency Wipe**: Triple-tap to instantly clear all data
+- **Performance Optimizations**: LZ4 message compression, adaptive battery modes, and optimized networking
+
+## Setup
+
+### Option 1: Using XcodeGen (Recommended)
+
+1. Install XcodeGen if you haven't already:
+ ```bash
+ brew install xcodegen
+ ```
+
+2. Generate the Xcode project:
+ ```bash
+ cd bitchat
+ xcodegen generate
+ ```
+
+3. Open the generated project:
+ ```bash
+ open bitchat.xcodeproj
+ ```
+
+### Option 2: Using Swift Package Manager
+
+1. Open the project in Xcode:
+ ```bash
+ cd bitchat
+ open Package.swift
+ ```
+
+2. Select your target device and run
+
+### Option 3: Manual Xcode Project
+
+1. Open Xcode and create a new iOS/macOS App
+2. Copy all Swift files from the `bitchat` directory into your project
+3. Update Info.plist with Bluetooth permissions
+4. Set deployment target to iOS 16.0 / macOS 13.0
+
+## Usage
+
+### Basic Commands
+
+- `/j #channel` - Join or create a channel
+- `/m @name message` - Send a private message
+- `/w` - List online users
+- `/channels` - Show all discovered channels
+- `/block @name` - Block a peer from messaging you
+- `/block` - List all blocked peers
+- `/unblock @name` - Unblock a peer
+- `/clear` - Clear chat messages
+- `/pass [password]` - Set/change channel password (owner only)
+- `/transfer @name` - Transfer channel ownership
+- `/save` - Toggle message retention for channel (owner only)
+
+### Getting Started
+
+1. Launch bitchat on your device
+2. Set your nickname (or use the auto-generated one)
+3. You'll automatically connect to nearby peers
+4. Join a channel with `/j #general` or start chatting in public
+5. Messages relay through the mesh network to reach distant peers
+
+### Channel Features
+
+- **Password Protection**: Channel owners can set passwords with `/pass`
+- **Message Retention**: Owners can enable mandatory message saving with `/save`
+- **@ Mentions**: Use `@nickname` to mention users (with autocomplete)
+- **Ownership Transfer**: Pass control to trusted users with `/transfer`
+
+## Security & Privacy
+
+### Encryption
+- **Private Messages**: X25519 key exchange + AES-256-GCM encryption
+- **Channel Messages**: Argon2id password derivation + AES-256-GCM
+- **Digital Signatures**: Ed25519 for message authenticity
+- **Forward Secrecy**: New key pairs generated each session
+
+### Privacy Features
+- **No Registration**: No accounts, emails, or phone numbers required
+- **Ephemeral by Default**: Messages exist only in device memory
+- **Cover Traffic**: Random delays and dummy messages prevent traffic analysis
+- **Emergency Wipe**: Triple-tap logo to instantly clear all data
+- **Local-First**: Works completely offline, no servers involved
+
+## Performance & Efficiency
+
+### Message Compression
+- **LZ4 Compression**: Automatic compression for messages >100 bytes
+- **30-70% bandwidth savings** on typical text messages
+- **Smart compression**: Skips already-compressed data
+
+### Battery Optimization
+- **Adaptive Power Modes**: Automatically adjusts based on battery level
+ - Performance mode: Full features when charging or >60% battery
+ - Balanced mode: Default operation (30-60% battery)
+ - Power saver: Reduced scanning when <30% battery
+ - Ultra-low power: Emergency mode when <10% battery
+- **Background efficiency**: Automatic power saving when app backgrounded
+- **Configurable scanning**: Duty cycle adapts to battery state
+
+### Network Efficiency
+- **Optimized Bloom filters**: Faster duplicate detection with less memory
+- **Message aggregation**: Batches small messages to reduce transmissions
+- **Adaptive connection limits**: Adjusts peer connections based on power mode
+
+## Technical Architecture
+
+### Binary Protocol
+bitchat uses an efficient binary protocol optimized for Bluetooth LE:
+- Compact packet format with 1-byte type field
+- TTL-based message routing (max 7 hops)
+- Automatic fragmentation for large messages
+- Message deduplication via unique IDs
+
+### Mesh Networking
+- Each device acts as both client and peripheral
+- Automatic peer discovery and connection management
+- Store-and-forward for offline message delivery
+- Adaptive duty cycling for battery optimization
+
+For detailed protocol documentation, see the [Technical Whitepaper](WHITEPAPER.md).
+
+## Building for Production
+
+1. Set your development team in project settings
+2. Configure code signing
+3. Archive and distribute through App Store or TestFlight
+
+## Android Compatibility
+
+The protocol is designed to be platform-agnostic. An Android client can be built using:
+- Bluetooth LE APIs
+- Same packet structure and encryption
+- Compatible service/characteristic UUIDs
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 00000000..9d1e7199
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,109 @@
+plugins {
+ id("com.android.application")
+ id("org.jetbrains.kotlin.android")
+ id("kotlin-parcelize")
+}
+
+android {
+ namespace = "com.bitchat.android"
+ compileSdk = 34
+
+ defaultConfig {
+ applicationId = "com.bitchat.android"
+ minSdk = 26 // API 26 for proper BLE support
+ targetSdk = 34
+ versionCode = 1
+ versionName = "1.0"
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ vectorDrawables {
+ useSupportLibrary = true
+ }
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+ buildFeatures {
+ compose = true
+ }
+ composeOptions {
+ kotlinCompilerExtensionVersion = "1.5.5"
+ }
+ packaging {
+ resources {
+ excludes += "/META-INF/{AL2.0,LGPL2.1}"
+ }
+ }
+ lint {
+ baseline = file("lint-baseline.xml")
+ abortOnError = false
+ checkReleaseBuilds = false
+ }
+}
+
+dependencies {
+ implementation("androidx.core:core-ktx:1.12.0")
+ implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+ implementation("androidx.activity:activity-compose:1.8.2")
+ implementation(platform("androidx.compose:compose-bom:2023.10.01"))
+ implementation("androidx.compose.ui:ui")
+ implementation("androidx.compose.ui:ui-graphics")
+ implementation("androidx.compose.ui:ui-tooling-preview")
+ implementation("androidx.compose.material3:material3")
+
+ // AppCompat for theme support
+ implementation("androidx.appcompat:appcompat:1.6.1")
+
+ // ViewModel and LiveData
+ implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
+ implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
+ implementation("androidx.compose.runtime:runtime-livedata")
+
+ // Navigation
+ implementation("androidx.navigation:navigation-compose:2.7.6")
+
+ // Permissions
+ implementation("com.google.accompanist:accompanist-permissions:0.32.0")
+
+ // Cryptography
+ implementation("org.bouncycastle:bcprov-jdk15on:1.70")
+ implementation("com.google.crypto.tink:tink-android:1.10.0")
+
+ // JSON
+ implementation("com.google.code.gson:gson:2.10.1")
+
+ // Coroutines
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+
+ // Bluetooth
+ implementation("no.nordicsemi.android:ble:2.6.1")
+
+ // Compression
+ implementation("org.lz4:lz4-java:1.8.0")
+
+ // Security preferences
+ implementation("androidx.security:security-crypto:1.1.0-alpha06")
+
+ // Testing
+ testImplementation("junit:junit:4.13.2")
+ androidTestImplementation("androidx.test.ext:junit:1.1.5")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+ androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
+ androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+ debugImplementation("androidx.compose.ui:ui-tooling")
+ debugImplementation("androidx.compose.ui:ui-test-manifest")
+}
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
new file mode 100644
index 00000000..cd316d72
--- /dev/null
+++ b/app/lint-baseline.xml
@@ -0,0 +1,598 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 00000000..f3c80b4f
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,7 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+-keep class com.bitchat.android.protocol.** { *; }
+-keep class com.bitchat.android.crypto.** { *; }
+-dontwarn org.bouncycastle.**
+-keep class org.bouncycastle.** { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..0ea01524
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/bitchat/android/BitchatApplication.kt b/app/src/main/java/com/bitchat/android/BitchatApplication.kt
new file mode 100644
index 00000000..99c9107b
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/BitchatApplication.kt
@@ -0,0 +1,16 @@
+package com.bitchat.android
+
+import android.app.Application
+
+/**
+ * Main application class for bitchat Android
+ */
+class BitchatApplication : Application() {
+
+ override fun onCreate() {
+ super.onCreate()
+
+ // Initialize any global services or configurations
+ // For now, keep it simple
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/MainActivity.kt b/app/src/main/java/com/bitchat/android/MainActivity.kt
new file mode 100644
index 00000000..30a8f2fb
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/MainActivity.kt
@@ -0,0 +1,97 @@
+package com.bitchat.android
+
+import android.Manifest
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import com.bitchat.android.ui.ChatScreen
+import com.bitchat.android.ui.ChatViewModel
+import com.bitchat.android.ui.theme.BitchatTheme
+
+class MainActivity : ComponentActivity() {
+
+ private val chatViewModel: ChatViewModel by viewModels()
+
+ private val permissionLauncher = registerForActivityResult(
+ ActivityResultContracts.RequestMultiplePermissions()
+ ) { permissions ->
+ val allPermissionsGranted = permissions.values.all { it }
+ if (allPermissionsGranted) {
+ // Permissions granted, the mesh service should start automatically
+ } else {
+ // Handle permission denial
+ finish()
+ }
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ // Request necessary permissions
+ requestPermissions()
+
+ setContent {
+ BitchatTheme {
+ Surface(
+ modifier = Modifier.fillMaxSize(),
+ color = MaterialTheme.colorScheme.background
+ ) {
+ ChatScreen(viewModel = chatViewModel)
+ }
+ }
+ }
+ }
+
+ private fun requestPermissions() {
+ val permissions = mutableListOf()
+
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+ permissions.addAll(listOf(
+ Manifest.permission.BLUETOOTH_ADVERTISE,
+ Manifest.permission.BLUETOOTH_CONNECT,
+ Manifest.permission.BLUETOOTH_SCAN
+ ))
+ } else {
+ permissions.addAll(listOf(
+ Manifest.permission.BLUETOOTH,
+ Manifest.permission.BLUETOOTH_ADMIN
+ ))
+ }
+
+ permissions.addAll(listOf(
+ Manifest.permission.ACCESS_COARSE_LOCATION,
+ Manifest.permission.ACCESS_FINE_LOCATION
+ ))
+
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+ permissions.add(Manifest.permission.POST_NOTIFICATIONS)
+ }
+
+ permissionLauncher.launch(permissions.toTypedArray())
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ // FIXED: Ensure Bluetooth resources are cleaned up when the activity is destroyed
+ // This addresses the issue where stale Bluetooth advertisements interfere with
+ // restart discovery times. This is more reliable than relying solely on
+ // ChatViewModel.onCleared() which may not be called when the app is swiped away.
+ try {
+ chatViewModel.meshService.stopServices()
+ } catch (e: Exception) {
+ // Log error, but don't crash the app on exit
+ android.util.Log.w("MainActivity", "Error stopping mesh services in onDestroy: ${e.message}")
+ }
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/crypto/EncryptionService.kt b/app/src/main/java/com/bitchat/android/crypto/EncryptionService.kt
new file mode 100644
index 00000000..f7611d70
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/crypto/EncryptionService.kt
@@ -0,0 +1,321 @@
+package com.bitchat.android.crypto
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import org.bouncycastle.crypto.agreement.X25519Agreement
+import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator
+import org.bouncycastle.crypto.generators.X25519KeyPairGenerator
+import org.bouncycastle.crypto.params.*
+import org.bouncycastle.crypto.signers.Ed25519Signer
+import org.bouncycastle.crypto.util.PrivateKeyFactory
+import org.bouncycastle.crypto.util.PublicKeyFactory
+import org.bouncycastle.jcajce.provider.digest.SHA256
+import java.security.SecureRandom
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.SecretKeySpec
+import kotlin.experimental.and
+
+/**
+ * Encryption service that's 100% compatible with iOS version
+ * Uses the same cryptographic algorithms and key derivation
+ */
+class EncryptionService(private val context: Context) {
+
+ // Key agreement keys for encryption
+ private val privateKey: X25519PrivateKeyParameters
+ private val publicKey: X25519PublicKeyParameters
+
+ // Signing keys for authentication
+ private val signingPrivateKey: Ed25519PrivateKeyParameters
+ private val signingPublicKey: Ed25519PublicKeyParameters
+
+ // Persistent identity for favorites (separate from ephemeral keys)
+ private lateinit var identityKey: Ed25519PrivateKeyParameters
+ private lateinit var identityPublicKey: Ed25519PublicKeyParameters
+
+ // Storage for peer keys
+ private val peerPublicKeys = mutableMapOf()
+ private val peerSigningKeys = mutableMapOf()
+ private val peerIdentityKeys = mutableMapOf()
+ private val sharedSecrets = mutableMapOf()
+
+ private val prefs: SharedPreferences = context.getSharedPreferences("bitchat_crypto", Context.MODE_PRIVATE)
+ private val secureRandom = SecureRandom()
+
+ init {
+ // Generate ephemeral key pairs for this session
+ val x25519Generator = X25519KeyPairGenerator()
+ x25519Generator.init(X25519KeyGenerationParameters(secureRandom))
+ val x25519KeyPair = x25519Generator.generateKeyPair()
+ privateKey = x25519KeyPair.private as X25519PrivateKeyParameters
+ publicKey = x25519KeyPair.public as X25519PublicKeyParameters
+
+ val ed25519Generator = Ed25519KeyPairGenerator()
+ ed25519Generator.init(Ed25519KeyGenerationParameters(secureRandom))
+ val ed25519KeyPair = ed25519Generator.generateKeyPair()
+ signingPrivateKey = ed25519KeyPair.private as Ed25519PrivateKeyParameters
+ signingPublicKey = ed25519KeyPair.public as Ed25519PublicKeyParameters
+
+ // Load or create persistent identity key
+ val identityKeyBytes = prefs.getString("identity_key", null)
+ if (identityKeyBytes != null) {
+ try {
+ val keyBytes = android.util.Base64.decode(identityKeyBytes, android.util.Base64.DEFAULT)
+ identityKey = Ed25519PrivateKeyParameters(keyBytes, 0)
+ } catch (e: Exception) {
+ // Create new identity key if loading fails
+ val newIdentityKeyPair = ed25519Generator.generateKeyPair()
+ identityKey = newIdentityKeyPair.private as Ed25519PrivateKeyParameters
+ saveIdentityKey()
+ }
+ } else {
+ // First run - create and save identity key
+ val newIdentityKeyPair = ed25519Generator.generateKeyPair()
+ identityKey = newIdentityKeyPair.private as Ed25519PrivateKeyParameters
+ saveIdentityKey()
+ }
+ identityPublicKey = Ed25519PublicKeyParameters(identityKey.encoded, 0)
+ }
+
+ private fun saveIdentityKey() {
+ val keyBytes = android.util.Base64.encodeToString(identityKey.encoded, android.util.Base64.DEFAULT)
+ prefs.edit().putString("identity_key", keyBytes).apply()
+ }
+
+ /**
+ * Create combined public key data for exchange - exactly same format as iOS
+ * 96 bytes total: 32 (X25519) + 32 (Ed25519 signing) + 32 (Ed25519 identity)
+ */
+ fun getCombinedPublicKeyData(): ByteArray {
+ val combined = ByteArray(96)
+ System.arraycopy(publicKey.encoded, 0, combined, 0, 32) // X25519 key
+ System.arraycopy(signingPublicKey.encoded, 0, combined, 32, 32) // Ed25519 signing key
+ System.arraycopy(identityPublicKey.encoded, 0, combined, 64, 32) // Ed25519 identity key
+ return combined
+ }
+
+ /**
+ * Add peer's combined public keys - exactly same logic as iOS
+ */
+ @Throws(Exception::class)
+ fun addPeerPublicKey(peerID: String, publicKeyData: ByteArray) {
+ if (publicKeyData.size != 96) {
+ throw Exception("Invalid public key data size: ${publicKeyData.size}, expected 96")
+ }
+
+ // Extract all three keys: 32 for key agreement + 32 for signing + 32 for identity
+ val keyAgreementData = publicKeyData.sliceArray(0..31)
+ val signingKeyData = publicKeyData.sliceArray(32..63)
+ val identityKeyData = publicKeyData.sliceArray(64..95)
+
+ val peerPublicKey = X25519PublicKeyParameters(keyAgreementData, 0)
+ peerPublicKeys[peerID] = peerPublicKey
+
+ val peerSigningKey = Ed25519PublicKeyParameters(signingKeyData, 0)
+ peerSigningKeys[peerID] = peerSigningKey
+
+ val peerIdentityKey = Ed25519PublicKeyParameters(identityKeyData, 0)
+ peerIdentityKeys[peerID] = peerIdentityKey
+
+ // Generate shared secret for encryption using X25519
+ val agreement = X25519Agreement()
+ agreement.init(privateKey)
+ val sharedSecret = ByteArray(32)
+ agreement.calculateAgreement(peerPublicKey, sharedSecret, 0)
+
+ // Derive symmetric key using HKDF with same salt as iOS
+ val salt = "bitchat-v1".toByteArray()
+ val derivedKey = hkdf(sharedSecret, salt, byteArrayOf(), 32)
+ sharedSecrets[peerID] = derivedKey
+ }
+
+ /**
+ * Get peer's persistent identity key for favorites
+ */
+ fun getPeerIdentityKey(peerID: String): ByteArray? {
+ return peerIdentityKeys[peerID]?.encoded
+ }
+
+ /**
+ * Clear persistent identity (for panic mode)
+ */
+ fun clearPersistentIdentity() {
+ prefs.edit().remove("identity_key").apply()
+ }
+
+ /**
+ * Encrypt data for a specific peer using AES-256-GCM
+ */
+ @Throws(Exception::class)
+ fun encrypt(data: ByteArray, peerID: String): ByteArray {
+ val symmetricKey = sharedSecrets[peerID]
+ ?: throw Exception("No shared secret for peer $peerID")
+
+ val cipher = Cipher.getInstance("AES/GCM/NoPadding")
+ val keySpec = SecretKeySpec(symmetricKey, "AES")
+ cipher.init(Cipher.ENCRYPT_MODE, keySpec)
+
+ val iv = cipher.iv
+ val ciphertext = cipher.doFinal(data)
+
+ // Combine IV and ciphertext (same format as iOS AES.GCM.SealedBox.combined)
+ val combined = ByteArray(iv.size + ciphertext.size)
+ System.arraycopy(iv, 0, combined, 0, iv.size)
+ System.arraycopy(ciphertext, 0, combined, iv.size, ciphertext.size)
+
+ return combined
+ }
+
+ /**
+ * Decrypt data from a specific peer
+ */
+ @Throws(Exception::class)
+ fun decrypt(data: ByteArray, peerID: String): ByteArray {
+ val symmetricKey = sharedSecrets[peerID]
+ ?: throw Exception("No shared secret for peer $peerID")
+
+ if (data.size < 16) { // 12 bytes IV + 16 bytes tag minimum for GCM
+ throw Exception("Invalid encrypted data size")
+ }
+
+ val cipher = Cipher.getInstance("AES/GCM/NoPadding")
+ val keySpec = SecretKeySpec(symmetricKey, "AES")
+
+ // Extract IV and ciphertext
+ val iv = data.sliceArray(0..11) // GCM IV is 12 bytes
+ val ciphertext = data.sliceArray(12 until data.size)
+
+ val gcmSpec = GCMParameterSpec(128, iv) // 128-bit authentication tag
+ cipher.init(Cipher.DECRYPT_MODE, keySpec, gcmSpec)
+
+ return cipher.doFinal(ciphertext)
+ }
+
+ /**
+ * Sign data using Ed25519
+ */
+ @Throws(Exception::class)
+ fun sign(data: ByteArray): ByteArray {
+ val signer = Ed25519Signer()
+ signer.init(true, signingPrivateKey)
+ signer.update(data, 0, data.size)
+ return signer.generateSignature()
+ }
+
+ /**
+ * Verify signature using Ed25519
+ */
+ @Throws(Exception::class)
+ fun verify(signature: ByteArray, data: ByteArray, peerID: String): Boolean {
+ val verifyingKey = peerSigningKeys[peerID]
+ ?: throw Exception("No signing key for peer $peerID")
+
+ val signer = Ed25519Signer()
+ signer.init(false, verifyingKey)
+ signer.update(data, 0, data.size)
+ return signer.verifySignature(signature)
+ }
+
+ /**
+ * HKDF implementation using SHA256 - same as iOS HKDF
+ */
+ private fun hkdf(ikm: ByteArray, salt: ByteArray, info: ByteArray, length: Int): ByteArray {
+ // Extract
+ val hmac = javax.crypto.Mac.getInstance("HmacSHA256")
+ val saltKey = SecretKeySpec(if (salt.isEmpty()) ByteArray(32) else salt, "HmacSHA256")
+ hmac.init(saltKey)
+ val prk = hmac.doFinal(ikm)
+
+ // Expand
+ hmac.init(SecretKeySpec(prk, "HmacSHA256"))
+ val result = ByteArray(length)
+ var offset = 0
+ var counter = 1
+
+ while (offset < length) {
+ hmac.reset()
+ if (counter > 1) {
+ hmac.update(result, offset - 32, 32)
+ }
+ hmac.update(info)
+ hmac.update(counter.toByte())
+
+ val t = hmac.doFinal()
+ val remaining = length - offset
+ val toCopy = minOf(t.size, remaining)
+ System.arraycopy(t, 0, result, offset, toCopy)
+
+ offset += toCopy
+ counter++
+ }
+
+ return result
+ }
+}
+
+/**
+ * Message padding utilities - exact same as iOS version
+ */
+object MessagePadding {
+ // Standard block sizes for padding
+ private val blockSizes = listOf(256, 512, 1024, 2048)
+
+ /**
+ * Add PKCS#7-style padding to reach target size
+ */
+ fun pad(data: ByteArray, targetSize: Int): ByteArray {
+ if (data.size >= targetSize) return data
+
+ val paddingNeeded = targetSize - data.size
+
+ // PKCS#7 only supports padding up to 255 bytes
+ if (paddingNeeded > 255) return data
+
+ val padded = ByteArray(targetSize)
+ System.arraycopy(data, 0, padded, 0, data.size)
+
+ // Fill with random bytes except the last byte
+ val random = SecureRandom()
+ random.nextBytes(padded.sliceArray(data.size until targetSize - 1))
+
+ // Last byte indicates padding length (PKCS#7)
+ padded[targetSize - 1] = paddingNeeded.toByte()
+
+ return padded
+ }
+
+ /**
+ * Remove padding from data
+ */
+ fun unpad(data: ByteArray): ByteArray {
+ if (data.isEmpty()) return data
+
+ // Last byte tells us how much padding to remove
+ val paddingLength = (data.last() and 0xFF.toByte()).toInt()
+ if (paddingLength <= 0 || paddingLength > data.size) return data
+
+ return data.sliceArray(0 until (data.size - paddingLength))
+ }
+
+ /**
+ * Find optimal block size for data
+ */
+ fun optimalBlockSize(dataSize: Int): Int {
+ // Account for encryption overhead (~16 bytes for AES-GCM tag)
+ val totalSize = dataSize + 16
+
+ // Find smallest block that fits
+ for (blockSize in blockSizes) {
+ if (totalSize <= blockSize) {
+ return blockSize
+ }
+ }
+
+ // For very large messages, just use the original size
+ return dataSize
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
new file mode 100644
index 00000000..cf0326e2
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
@@ -0,0 +1,1594 @@
+package com.bitchat.android.mesh
+
+import android.Manifest
+import android.bluetooth.*
+import android.bluetooth.le.*
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.ParcelUuid
+import android.util.Log
+import androidx.core.app.ActivityCompat
+import com.bitchat.android.crypto.EncryptionService
+import com.bitchat.android.crypto.MessagePadding
+import com.bitchat.android.model.BitchatMessage
+import com.bitchat.android.model.DeliveryAck
+import com.bitchat.android.model.ReadReceipt
+import com.bitchat.android.protocol.BitchatPacket
+import com.bitchat.android.protocol.MessageType
+import com.bitchat.android.protocol.SpecialRecipients
+import kotlinx.coroutines.*
+import java.security.MessageDigest
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import kotlin.random.Random
+
+/**
+ * Bluetooth mesh service - 100% compatible with iOS version
+ * Uses exact same UUIDs, packet format, and protocol logic
+ */
+class BluetoothMeshService(private val context: Context) {
+
+ companion object {
+ // Exact same UUIDs as iOS version
+ private val SERVICE_UUID = UUID.fromString("F47B5E2D-4A9E-4C5A-9B3F-8E1D2C3A4B5C")
+ private val CHARACTERISTIC_UUID = UUID.fromString("A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D")
+
+ private const val TAG = "BluetoothMeshService"
+ private const val MAX_TTL: UByte = 7u
+ private const val MAX_FRAGMENT_SIZE = 500 // Optimized for BLE 5.0
+ private const val MESSAGE_CACHE_TIMEOUT = 43200000L // 12 hours for regular peers
+ private const val MAX_CACHED_MESSAGES = 100 // For regular peers
+ private const val MAX_CACHED_MESSAGES_FAVORITES = 1000 // For favorites
+ }
+
+ // Core networking components
+ private val bluetoothManager: BluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+ private val bluetoothAdapter: BluetoothAdapter? = bluetoothManager.adapter
+ private val bleScanner: BluetoothLeScanner? = bluetoothAdapter?.bluetoothLeScanner
+ private val bleAdvertiser: BluetoothLeAdvertiser? = bluetoothAdapter?.bluetoothLeAdvertiser
+
+ // Services for peripheral mode
+ private var gattServer: BluetoothGattServer? = null
+ private var characteristic: BluetoothGattCharacteristic? = null
+
+ // Connected devices tracking - FIXED to properly track both server and client connections
+ private val connectedDevices = ConcurrentHashMap()
+ private val deviceCharacteristics = ConcurrentHashMap()
+ private val subscribedDevices = CopyOnWriteArrayList()
+ private val gattConnections = ConcurrentHashMap() // NEW: Track GATT connections
+ private val peripheralRSSI = ConcurrentHashMap() // Track RSSI by device address during discovery
+
+ // Peer management
+ private val peerNicknames = ConcurrentHashMap()
+ private val activePeers = ConcurrentHashMap() // peerID -> lastSeen timestamp
+ private val peerRSSI = ConcurrentHashMap()
+
+ // Message processing
+ private val encryptionService = EncryptionService(context)
+ private val processedMessages = Collections.synchronizedSet(mutableSetOf())
+ private val processedKeyExchanges = Collections.synchronizedSet(mutableSetOf())
+
+ // Store-and-forward message cache
+ private data class StoredMessage(
+ val packet: BitchatPacket,
+ val timestamp: Long,
+ val messageID: String,
+ val isForFavorite: Boolean
+ )
+ private val messageCache = Collections.synchronizedList(mutableListOf())
+ private val favoriteMessageQueue = ConcurrentHashMap>()
+ private val deliveredMessages = Collections.synchronizedSet(mutableSetOf())
+ private val cachedMessagesSentToPeer = Collections.synchronizedSet(mutableSetOf())
+
+ // Fragment handling
+ private val incomingFragments = ConcurrentHashMap>()
+ private val fragmentMetadata = ConcurrentHashMap>() // originalType, totalFragments, timestamp
+
+ // Privacy and security
+ private val announcedToPeers = Collections.synchronizedSet(mutableSetOf())
+ private val announcedPeers = Collections.synchronizedSet(mutableSetOf())
+ private val blockedUsers = Collections.synchronizedSet(mutableSetOf())
+
+ // My peer identification - FIXED to match iOS format
+ val myPeerID: String = generateCompatiblePeerID()
+
+ // Delegate for message callbacks
+ var delegate: BluetoothMeshDelegate? = null
+
+ // Coroutines
+ private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+ // FIXED: Generate peer ID compatible with iOS
+ private fun generateCompatiblePeerID(): String {
+ val randomBytes = ByteArray(4)
+ Random.nextBytes(randomBytes)
+ return randomBytes.joinToString("") { "%02x".format(it) }
+ }
+
+ /**
+ * Start the mesh service - begins advertising and scanning - IMPROVED with better initialization
+ */
+ fun startServices() {
+ Log.i(TAG, "Starting Bluetooth mesh service...")
+
+ if (!hasBluetoothPermissions()) {
+ Log.e(TAG, "Missing Bluetooth permissions - cannot start services")
+ return
+ }
+
+ if (bluetoothAdapter?.isEnabled != true) {
+ Log.e(TAG, "Bluetooth is not enabled - cannot start services")
+ return
+ }
+
+ if (bleScanner == null || bleAdvertiser == null) {
+ Log.e(TAG, "BLE scanner or advertiser not available")
+ return
+ }
+
+ Log.i(TAG, "Starting Bluetooth mesh service with peer ID: $myPeerID")
+
+ // Start services in sequence with proper error handling
+ try {
+ setupGattServer()
+
+ // Small delay to ensure GATT server is ready
+ serviceScope.launch {
+ delay(500)
+
+ startAdvertising()
+ delay(200)
+
+ startScanning()
+ delay(200)
+
+ // Send initial announcements after all services are ready
+ delay(1000)
+ sendBroadcastAnnounce()
+
+ // Start periodic cleanup
+ startPeriodicTasks()
+
+ Log.i(TAG, "All Bluetooth mesh services started successfully")
+ }
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to start Bluetooth mesh services: ${e.message}")
+ }
+ }
+
+ /**
+ * Stop all mesh services - FIXED to properly clean up all connections
+ */
+ fun stopServices() {
+ Log.i(TAG, "Stopping Bluetooth mesh service")
+
+ // Send leave announcement before disconnecting
+ sendLeaveAnnouncement()
+
+ serviceScope.launch {
+ delay(200) // Give leave message time to send
+
+ // Cleanup all GATT client connections
+ gattConnections.values.forEach { gatt ->
+ try {
+ gatt.disconnect()
+ gatt.close()
+ } catch (e: Exception) {
+ Log.w(TAG, "Error closing GATT connection: ${e.message}")
+ }
+ }
+
+ // Stop advertising and scanning
+ stopAdvertising()
+ stopScanning()
+
+ // Close GATT server
+ gattServer?.close()
+
+ // Clear all connection tracking
+ connectedDevices.clear()
+ deviceCharacteristics.clear()
+ subscribedDevices.clear()
+ gattConnections.clear() // FIXED: Clear GATT connections
+ activePeers.clear()
+
+ serviceScope.cancel()
+ }
+ }
+
+ private fun hasBluetoothPermissions(): Boolean {
+ val permissions = mutableListOf()
+
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+ permissions.addAll(listOf(
+ Manifest.permission.BLUETOOTH_ADVERTISE,
+ Manifest.permission.BLUETOOTH_CONNECT,
+ Manifest.permission.BLUETOOTH_SCAN
+ ))
+ } else {
+ permissions.addAll(listOf(
+ Manifest.permission.BLUETOOTH,
+ Manifest.permission.BLUETOOTH_ADMIN
+ ))
+ }
+
+ permissions.addAll(listOf(
+ Manifest.permission.ACCESS_COARSE_LOCATION,
+ Manifest.permission.ACCESS_FINE_LOCATION
+ ))
+
+ return permissions.all {
+ ActivityCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED
+ }
+ }
+
+ /**
+ * Setup GATT server for peripheral mode
+ */
+ private fun setupGattServer() {
+ if (!hasBluetoothPermissions()) return
+
+ val serverCallback = object : BluetoothGattServerCallback() {
+ override fun onConnectionStateChange(device: BluetoothDevice, status: Int, newState: Int) {
+ when (newState) {
+ BluetoothProfile.STATE_CONNECTED -> {
+ Log.d(TAG, "Device connected: ${device.address}")
+
+ // FIXED: Check if this is a stale connection from previous app session
+ if (!subscribedDevices.contains(device)) {
+ Log.w(TAG, "Received stale connection from ${device.address}, disconnecting")
+ // Disconnect stale connections immediately
+ gattServer?.cancelConnection(device)
+ return
+ }
+
+ connectedDevices[device.address] = device
+ }
+ BluetoothProfile.STATE_DISCONNECTED -> {
+ Log.d(TAG, "Device disconnected: ${device.address}")
+ connectedDevices.remove(device.address)
+ deviceCharacteristics.remove(device)
+ subscribedDevices.remove(device)
+ }
+ }
+ }
+
+ override fun onCharacteristicWriteRequest(
+ device: BluetoothDevice,
+ requestId: Int,
+ characteristic: BluetoothGattCharacteristic,
+ preparedWrite: Boolean,
+ responseNeeded: Boolean,
+ offset: Int,
+ value: ByteArray
+ ) {
+ if (characteristic.uuid == CHARACTERISTIC_UUID) {
+ Log.d(TAG, "Received write request from ${device.address}, ${value.size} bytes")
+
+ // Process received packet
+ val packet = BitchatPacket.fromBinaryData(value)
+ if (packet != null) {
+ val peerID = String(packet.senderID).replace("\u0000", "")
+ handleReceivedPacket(packet, peerID, device)
+ }
+
+ if (responseNeeded) {
+ gattServer?.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, 0, null)
+ }
+ }
+ }
+
+ override fun onDescriptorWriteRequest(
+ device: BluetoothDevice,
+ requestId: Int,
+ descriptor: BluetoothGattDescriptor,
+ preparedWrite: Boolean,
+ responseNeeded: Boolean,
+ offset: Int,
+ value: ByteArray
+ ) {
+ if (BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE.contentEquals(value)) {
+ Log.d(TAG, "Device ${device.address} subscribed to notifications")
+ if (!subscribedDevices.contains(device)) {
+ subscribedDevices.add(device)
+
+ // Send key exchange to newly connected device
+ serviceScope.launch {
+ delay(100) // Small delay to ensure connection is stable
+ sendKeyExchangeToDevice(device)
+ }
+ }
+ }
+
+ if (responseNeeded) {
+ gattServer?.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, 0, null)
+ }
+ }
+ }
+
+ // FIXED: Clean up any existing GATT server to prevent stale connections
+ gattServer?.close()
+
+ // FIXED: Clear all connection tracking to start fresh
+ connectedDevices.clear()
+ deviceCharacteristics.clear()
+ subscribedDevices.clear()
+ gattConnections.clear()
+
+ Log.i(TAG, "Setting up fresh GATT server, cleared all previous connections")
+
+ gattServer = bluetoothManager.openGattServer(context, serverCallback)
+
+ // Create characteristic with same UUID as iOS
+ characteristic = BluetoothGattCharacteristic(
+ CHARACTERISTIC_UUID,
+ BluetoothGattCharacteristic.PROPERTY_READ or
+ BluetoothGattCharacteristic.PROPERTY_WRITE or
+ BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE or
+ BluetoothGattCharacteristic.PROPERTY_NOTIFY,
+ BluetoothGattCharacteristic.PERMISSION_READ or
+ BluetoothGattCharacteristic.PERMISSION_WRITE
+ )
+
+ // Add notification descriptor
+ val descriptor = BluetoothGattDescriptor(
+ UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"),
+ BluetoothGattDescriptor.PERMISSION_READ or BluetoothGattDescriptor.PERMISSION_WRITE
+ )
+ characteristic?.addDescriptor(descriptor)
+
+ // Create service
+ val service = BluetoothGattService(SERVICE_UUID, BluetoothGattService.SERVICE_TYPE_PRIMARY)
+ service.addCharacteristic(characteristic)
+
+ gattServer?.addService(service)
+ }
+
+ /**
+ * Start BLE advertising - FIXED to exactly match iOS implementation using service data
+ */
+ private fun startAdvertising() {
+ if (!hasBluetoothPermissions() || bleAdvertiser == null) {
+ Log.e(TAG, "Cannot start advertising: missing permissions or advertiser unavailable")
+ return
+ }
+
+ val settings = AdvertiseSettings.Builder()
+ .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_BALANCED)
+ .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_MEDIUM)
+ .setConnectable(true)
+ .setTimeout(0)
+ .build()
+
+ // iOS uses: CBAdvertisementDataLocalNameKey: myPeerID
+ // Android equivalent: addServiceData() with peer ID bytes
+ val data = AdvertiseData.Builder()
+ .addServiceUuid(ParcelUuid(SERVICE_UUID))
+ .addServiceData(ParcelUuid(SERVICE_UUID), myPeerID.toByteArray(Charsets.UTF_8))
+ .setIncludeTxPowerLevel(false)
+ .setIncludeDeviceName(false)
+ .build()
+
+ val advertiseCallback = object : AdvertiseCallback() {
+ override fun onStartSuccess(settingsInEffect: AdvertiseSettings) {
+ Log.i(TAG, "Advertising started successfully with peer ID in service data: $myPeerID")
+ }
+
+ override fun onStartFailure(errorCode: Int) {
+ val errorMessage = when (errorCode) {
+ ADVERTISE_FAILED_ALREADY_STARTED -> "Already started"
+ ADVERTISE_FAILED_DATA_TOO_LARGE -> "Data too large"
+ ADVERTISE_FAILED_FEATURE_UNSUPPORTED -> "Feature unsupported"
+ ADVERTISE_FAILED_INTERNAL_ERROR -> "Internal error"
+ ADVERTISE_FAILED_TOO_MANY_ADVERTISERS -> "Too many advertisers"
+ else -> "Unknown error: $errorCode"
+ }
+ Log.e(TAG, "Advertising failed: $errorMessage")
+
+ // If this fails, try minimal advertising
+ if (errorCode == ADVERTISE_FAILED_DATA_TOO_LARGE) {
+ Log.w(TAG, "Service data too large, trying minimal advertising")
+ startMinimalAdvertising()
+ }
+ }
+ }
+
+ Log.d(TAG, "Starting BLE advertising with peer ID in service data: $myPeerID")
+
+ try {
+ bleAdvertiser.startAdvertising(settings, data, advertiseCallback)
+ } catch (e: Exception) {
+ Log.e(TAG, "Exception starting advertising: ${e.message}")
+ }
+ }
+
+ /**
+ * Fallback minimal advertising without peer ID if the main approach fails
+ */
+ private fun startMinimalAdvertising() {
+ if (!hasBluetoothPermissions() || bleAdvertiser == null) return
+
+ val settings = AdvertiseSettings.Builder()
+ .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_BALANCED)
+ .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_MEDIUM)
+ .setConnectable(true)
+ .setTimeout(0)
+ .build()
+
+ // Minimal advertisement - just the service UUID
+ val data = AdvertiseData.Builder()
+ .setIncludeDeviceName(false)
+ .setIncludeTxPowerLevel(false)
+ .addServiceUuid(ParcelUuid(SERVICE_UUID))
+ .build()
+
+ val advertiseCallback = object : AdvertiseCallback() {
+ override fun onStartSuccess(settingsInEffect: AdvertiseSettings) {
+ Log.i(TAG, "Minimal advertising started successfully (no peer ID in advertisement)")
+ }
+
+ override fun onStartFailure(errorCode: Int) {
+ Log.e(TAG, "Even minimal advertising failed: $errorCode")
+ }
+ }
+
+ try {
+ bleAdvertiser.startAdvertising(settings, data, advertiseCallback)
+ } catch (e: Exception) {
+ Log.e(TAG, "Exception starting minimal advertising: ${e.message}")
+ }
+ }
+
+ /**
+ * Stop BLE advertising
+ */
+ private fun stopAdvertising() {
+ if (!hasBluetoothPermissions() || bleAdvertiser == null) return
+
+ bleAdvertiser.stopAdvertising(object : AdvertiseCallback() {})
+ }
+
+ /**
+ * Start BLE scanning - FIXED for better peer discovery
+ */
+ private fun startScanning() {
+ if (!hasBluetoothPermissions() || bleScanner == null) {
+ Log.e(TAG, "Cannot start scanning: missing permissions or scanner unavailable")
+ return
+ }
+
+ val scanFilter = ScanFilter.Builder()
+ .setServiceUuid(ParcelUuid(SERVICE_UUID))
+ .build()
+
+ // FIXED: More aggressive scanning settings for better peer discovery
+ val scanSettings = ScanSettings.Builder()
+ .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY) // More aggressive scanning
+ .setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
+ .setMatchMode(ScanSettings.MATCH_MODE_AGGRESSIVE)
+ .setNumOfMatches(ScanSettings.MATCH_NUM_MAX_ADVERTISEMENT)
+ .setReportDelay(10) // Report immediately
+ .build()
+
+ val scanCallback = object : ScanCallback() {
+ override fun onScanResult(callbackType: Int, result: ScanResult) {
+ handleScanResult(result)
+ }
+
+ override fun onBatchScanResults(results: MutableList) {
+ Log.d(TAG, "Batch scan results: ${results.size} devices")
+ results.forEach { handleScanResult(it) }
+ }
+
+ override fun onScanFailed(errorCode: Int) {
+ val errorMessage = when (errorCode) {
+ SCAN_FAILED_ALREADY_STARTED -> "Already started"
+ SCAN_FAILED_APPLICATION_REGISTRATION_FAILED -> "App registration failed"
+ SCAN_FAILED_FEATURE_UNSUPPORTED -> "Feature unsupported"
+ SCAN_FAILED_INTERNAL_ERROR -> "Internal error"
+ else -> "Unknown error: $errorCode"
+ }
+ Log.e(TAG, "Scan failed: $errorMessage")
+ }
+ }
+
+ try {
+ bleScanner.startScan(listOf(scanFilter), scanSettings, scanCallback)
+ Log.i(TAG, "Started BLE scanning with aggressive settings")
+ } catch (e: Exception) {
+ Log.e(TAG, "Exception starting scan: ${e.message}")
+ }
+ }
+
+ /**
+ * Stop BLE scanning
+ */
+ private fun stopScanning() {
+ if (!hasBluetoothPermissions() || bleScanner == null) return
+
+ bleScanner.stopScan(object : ScanCallback() {})
+ }
+
+ /**
+ * Handle scan result - connect to discovered devices - FIXED to connect regardless of peer ID extraction
+ */
+ private fun handleScanResult(result: ScanResult) {
+ val device = result.device
+ val rssi = result.rssi
+
+ Log.d(TAG, "Scan result: ${device.address}, RSSI: $rssi")
+
+ // Filter out weak signals
+ if (rssi < -90) {
+ Log.d(TAG, "Ignoring weak signal from ${device.address}: $rssi dBm")
+ return
+ }
+
+ // Check if already known and connected
+ if (connectedDevices.values.any { it.address == device.address }) {
+ Log.d(TAG, "Already connected to device: ${device.address}")
+ return
+ }
+
+ // FIXED: Always attempt connection to devices advertising our service UUID
+ // Peer ID will be obtained during key exchange, not from advertisements
+ Log.i(TAG, "Found bitchat service at ${device.address} (RSSI: $rssi), attempting connection")
+
+ // Store RSSI by device address for now (will be mapped to peer ID after key exchange)
+ peripheralRSSI[device.address] = rssi
+
+ // Attempt connection - peer ID will be determined during key exchange
+ connectToDevice(device)
+
+ // OPTIONAL: Still try to extract peer ID for optimization, but don't require it
+ var discoveredPeerID: String? = null
+
+ // Method 1: Try service data first (Android method - peer ID is in service data)
+ val scanRecord = result.scanRecord
+ val serviceData = scanRecord?.getServiceData(ParcelUuid(SERVICE_UUID))
+ if (serviceData != null && serviceData.isNotEmpty()) {
+ try {
+ val peerIdFromServiceData = String(serviceData, Charsets.UTF_8)
+ if (peerIdFromServiceData.length == 8 && peerIdFromServiceData != myPeerID) {
+ discoveredPeerID = peerIdFromServiceData
+ Log.d(TAG, "Extracted peer ID from service data: $discoveredPeerID")
+ }
+ } catch (e: Exception) {
+ Log.w(TAG, "Failed to decode service data as peer ID: ${e.message}")
+ }
+ }
+
+ // Method 2: Try device name as fallback (iOS method compatibility)
+ if (discoveredPeerID == null) {
+ try {
+ val deviceName = device.name
+ if (!deviceName.isNullOrEmpty() && deviceName.length == 8 && deviceName != myPeerID) {
+ discoveredPeerID = deviceName
+ Log.d(TAG, "Extracted peer ID from device name (iOS compatibility): $discoveredPeerID")
+ }
+ } catch (e: SecurityException) {
+ Log.w(TAG, "No permission to access device name")
+ }
+ }
+
+ // If we extracted a peer ID, pre-populate tracking data
+ if (discoveredPeerID != null) {
+ Log.i(TAG, "Pre-discovered peer: $discoveredPeerID at ${device.address}")
+ activePeers[discoveredPeerID] = System.currentTimeMillis()
+ peerRSSI[discoveredPeerID] = rssi
+ } else {
+ Log.d(TAG, "No peer ID found in advertisements for ${device.address}, will get it via key exchange")
+ }
+ }
+
+ /**
+ * Connect to a discovered device
+ */
+ private fun connectToDevice(device: BluetoothDevice) {
+ if (!hasBluetoothPermissions()) return
+
+ Log.d(TAG, "Connecting to device: ${device.address}")
+
+ val gattCallback = object : BluetoothGattCallback() {
+ override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
+ when (newState) {
+ BluetoothProfile.STATE_CONNECTED -> {
+ Log.d(TAG, "Connected to ${gatt.device.address}")
+ // FIXED: Properly track the GATT connection
+ connectedDevices[gatt.device.address] = gatt.device
+ gattConnections[gatt.device] = gatt
+ gatt.discoverServices()
+ }
+ BluetoothProfile.STATE_DISCONNECTED -> {
+ Log.d(TAG, "Disconnected from ${gatt.device.address}")
+ connectedDevices.remove(gatt.device.address)
+ deviceCharacteristics.remove(gatt.device)
+ gattConnections.remove(gatt.device) // FIXED: Remove GATT connection tracking
+ gatt.close()
+ }
+ }
+ }
+
+ override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
+ if (status == BluetoothGatt.GATT_SUCCESS) {
+ val service = gatt.getService(SERVICE_UUID)
+ val characteristic = service?.getCharacteristic(CHARACTERISTIC_UUID)
+
+ if (characteristic != null) {
+ deviceCharacteristics[gatt.device] = characteristic
+ gatt.setCharacteristicNotification(characteristic, true)
+
+ // Enable notifications
+ val descriptor = characteristic.getDescriptor(
+ UUID.fromString("00002902-0000-1000-8000-00805f9b34fb")
+ )
+ descriptor?.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
+ gatt.writeDescriptor(descriptor)
+
+ // Send key exchange
+ serviceScope.launch {
+ delay(200) // Ensure connection is stable
+ sendKeyExchangeToGatt(gatt)
+ }
+ }
+ }
+ }
+
+ override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
+ val value = characteristic.value
+ Log.d(TAG, "Received notification from ${gatt.device.address}, ${value.size} bytes")
+
+ val packet = BitchatPacket.fromBinaryData(value)
+ if (packet != null) {
+ val peerID = String(packet.senderID).replace("\u0000", "")
+ handleReceivedPacket(packet, peerID, gatt.device)
+ }
+ }
+
+ override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
+ if (status == BluetoothGatt.GATT_SUCCESS) {
+ Log.d(TAG, "Successfully wrote to characteristic on ${gatt.device.address}")
+ } else {
+ Log.w(TAG, "Failed to write to characteristic on ${gatt.device.address}, status: $status")
+ }
+ }
+ }
+
+ device.connectGatt(context, false, gattCallback)
+ }
+
+ /**
+ * Send key exchange to a connected device (server mode)
+ */
+ private fun sendKeyExchangeToDevice(device: BluetoothDevice) {
+ val publicKeyData = encryptionService.getCombinedPublicKeyData()
+ val packet = BitchatPacket(
+ type = MessageType.KEY_EXCHANGE.value,
+ ttl = 1u,
+ senderID = myPeerID,
+ payload = publicKeyData
+ )
+
+ packet.toBinaryData()?.let { data ->
+ characteristic?.value = data
+ gattServer?.notifyCharacteristicChanged(device, characteristic, false)
+ Log.d(TAG, "Sent key exchange to device: ${device.address}")
+ }
+ }
+
+ /**
+ * Send key exchange to a connected device (client mode)
+ */
+ private fun sendKeyExchangeToGatt(gatt: BluetoothGatt) {
+ val publicKeyData = encryptionService.getCombinedPublicKeyData()
+ val packet = BitchatPacket(
+ type = MessageType.KEY_EXCHANGE.value,
+ ttl = 1u,
+ senderID = myPeerID,
+ payload = publicKeyData
+ )
+
+ val characteristic = deviceCharacteristics[gatt.device]
+ if (characteristic != null) {
+ packet.toBinaryData()?.let { data ->
+ characteristic.value = data
+ gatt.writeCharacteristic(characteristic)
+ Log.d(TAG, "Sent key exchange to GATT: ${gatt.device.address}")
+ }
+ }
+ }
+
+ /**
+ * Handle received packet - core protocol logic (exact same as iOS)
+ */
+ private fun handleReceivedPacket(packet: BitchatPacket, peerID: String, device: BluetoothDevice? = null) {
+ serviceScope.launch {
+ // TTL check
+ if (packet.ttl == 0u.toUByte()) return@launch
+
+ // Validate packet payload
+ if (packet.payload.isEmpty()) return@launch
+
+ // Update last seen timestamp
+ if (peerID != "unknown" && peerID != myPeerID) {
+ activePeers[peerID] = System.currentTimeMillis()
+ }
+
+ // Replay attack protection (same 5-minute window as iOS)
+ val currentTime = System.currentTimeMillis()
+ val timeDiff = kotlin.math.abs(currentTime - packet.timestamp.toLong())
+ if (timeDiff > 300000) { // 5 minutes
+ Log.d(TAG, "Dropping old packet from $peerID, time diff: ${timeDiff/1000}s")
+ return@launch
+ }
+
+ // Duplicate detection
+ val messageID = generateMessageID(packet)
+ if (processedMessages.contains(messageID)) {
+ return@launch
+ }
+ processedMessages.add(messageID)
+
+ // Process based on message type (exact same logic as iOS)
+ when (MessageType.fromValue(packet.type)) {
+ MessageType.KEY_EXCHANGE -> handleKeyExchange(packet, peerID, device)
+ MessageType.ANNOUNCE -> handleAnnounce(packet, peerID)
+ MessageType.MESSAGE -> handleMessage(packet, peerID)
+ MessageType.LEAVE -> handleLeave(packet, peerID)
+ MessageType.FRAGMENT_START,
+ MessageType.FRAGMENT_CONTINUE,
+ MessageType.FRAGMENT_END -> handleFragment(packet, peerID)
+ MessageType.DELIVERY_ACK -> handleDeliveryAck(packet, peerID)
+ MessageType.READ_RECEIPT -> handleReadReceipt(packet, peerID)
+ else -> Log.d(TAG, "Unknown message type: ${packet.type}")
+ }
+ }
+ }
+
+ /**
+ * Generate message ID for duplicate detection
+ */
+ private fun generateMessageID(packet: BitchatPacket): String {
+ return when (MessageType.fromValue(packet.type)) {
+ MessageType.FRAGMENT_START, MessageType.FRAGMENT_CONTINUE, MessageType.FRAGMENT_END -> {
+ "${packet.timestamp}-${String(packet.senderID)}-${packet.type}-${packet.payload.contentHashCode()}"
+ }
+ else -> {
+ "${packet.timestamp}-${String(packet.senderID)}-${packet.payload.sliceArray(0 until minOf(64, packet.payload.size)).contentHashCode()}"
+ }
+ }
+ }
+
+ /**
+ * Handle key exchange message
+ */
+ private suspend fun handleKeyExchange(packet: BitchatPacket, peerID: String, device: BluetoothDevice?) {
+ if (peerID == myPeerID) return
+
+ if (packet.payload.isNotEmpty()) {
+ val exchangeKey = "$peerID-${packet.payload.sliceArray(0 until minOf(16, packet.payload.size)).contentHashCode()}"
+
+ if (processedKeyExchanges.contains(exchangeKey)) return
+ processedKeyExchanges.add(exchangeKey)
+
+ try {
+ encryptionService.addPeerPublicKey(peerID, packet.payload)
+
+ // Add to active peers
+ activePeers[peerID] = System.currentTimeMillis()
+
+ // Send our announce
+ delay(100)
+ sendAnnouncementToPeer(peerID)
+
+ // Send cached messages for this peer
+ delay(500)
+ sendCachedMessages(peerID)
+
+ Log.d(TAG, "Processed key exchange from $peerID")
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to process key exchange from $peerID: ${e.message}")
+ }
+ }
+ }
+
+ /**
+ * Handle announce message
+ */
+ private suspend fun handleAnnounce(packet: BitchatPacket, peerID: String) {
+ if (peerID == myPeerID) return
+
+ val nickname = String(packet.payload, Charsets.UTF_8)
+ Log.d(TAG, "Received announce from $peerID: $nickname")
+
+ // Clean up stale peer IDs with the same nickname (exact same logic as iOS)
+ val stalePeerIDs = mutableListOf()
+ peerNicknames.forEach { (existingPeerID, existingNickname) ->
+ if (existingNickname == nickname && existingPeerID != peerID) {
+ val lastSeen = activePeers[existingPeerID] ?: 0
+ val wasRecentlySeen = (System.currentTimeMillis() - lastSeen) < 10000
+ if (!wasRecentlySeen) {
+ stalePeerIDs.add(existingPeerID)
+ }
+ }
+ }
+
+ // Remove stale peer IDs
+ stalePeerIDs.forEach { stalePeerID ->
+ peerNicknames.remove(stalePeerID)
+ activePeers.remove(stalePeerID)
+ announcedPeers.remove(stalePeerID)
+ peerRSSI.remove(stalePeerID)
+ }
+
+ // Add new peer
+ val isFirstAnnounce = !announcedPeers.contains(peerID)
+ peerNicknames[peerID] = nickname
+ activePeers[peerID] = System.currentTimeMillis()
+
+ if (isFirstAnnounce) {
+ announcedPeers.add(peerID)
+ delegate?.didConnectToPeer(nickname)
+ notifyPeerListUpdate()
+ }
+
+ // Relay announce if TTL > 0
+ if (packet.ttl > 1u) {
+ val relayPacket = packet.copy(ttl = (packet.ttl - 1u).toUByte())
+ delay(Random.nextLong(100, 300))
+ broadcastPacket(relayPacket)
+ }
+ }
+
+ /**
+ * Handle broadcast or private message
+ */
+ private suspend fun handleMessage(packet: BitchatPacket, peerID: String) {
+ if (peerID == myPeerID) return
+
+ val recipientID = packet.recipientID?.takeIf { !it.contentEquals(SpecialRecipients.BROADCAST) }
+
+ if (recipientID == null) {
+ // BROADCAST MESSAGE
+ try {
+ // Parse message
+ val message = BitchatMessage.fromBinaryPayload(packet.payload)
+ if (message != null) {
+ // Check for cover traffic (dummy messages)
+ if (message.content.startsWith("☂DUMMY☂")) {
+ return // Silently discard
+ }
+
+ peerNicknames[peerID] = message.sender
+
+ // Handle encrypted channel messages
+ val finalContent = if (message.channel != null && message.isEncrypted && message.encryptedContent != null) {
+ delegate?.decryptChannelMessage(message.encryptedContent, message.channel)
+ ?: "[Encrypted message - password required]"
+ } else {
+ message.content
+ }
+
+ // Replace timestamp with current time
+ val messageWithCurrentTime = message.copy(
+ content = finalContent,
+ senderPeerID = peerID,
+ timestamp = Date() // Use current time instead of original timestamp
+ )
+
+ delegate?.didReceiveMessage(messageWithCurrentTime)
+ }
+
+ // Relay broadcast messages
+ relayMessage(packet)
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to process broadcast message: ${e.message}")
+ }
+
+ } else if (recipientID != null && String(recipientID).replace("\u0000", "") == myPeerID) {
+ // PRIVATE MESSAGE FOR US
+ try {
+ // Verify signature if present
+ packet.signature?.let { signature ->
+ if (!encryptionService.verify(signature, packet.payload, peerID)) {
+ Log.w(TAG, "Invalid signature for private message from $peerID")
+ return
+ }
+ }
+
+ // Decrypt message
+ val decryptedData = encryptionService.decrypt(packet.payload, peerID)
+ val unpaddedData = MessagePadding.unpad(decryptedData)
+
+ // Parse message
+ val message = BitchatMessage.fromBinaryPayload(unpaddedData)
+ if (message != null) {
+ // Check for cover traffic (dummy messages)
+ if (message.content.startsWith("☂DUMMY☂")) {
+ return // Silently discard
+ }
+
+ peerNicknames[peerID] = message.sender
+
+ // Replace timestamp with current time
+ val messageWithCurrentTime = message.copy(
+ senderPeerID = peerID,
+ timestamp = Date() // Use current time instead of original timestamp
+ )
+ delegate?.didReceiveMessage(messageWithCurrentTime)
+
+ // Send delivery ACK
+ sendDeliveryAck(message, peerID)
+ }
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to decrypt private message from $peerID: ${e.message}")
+ }
+
+ } else if (packet.ttl > 0u) {
+ // RELAY MESSAGE
+ relayMessage(packet)
+ }
+ }
+
+ /**
+ * Handle leave message
+ */
+ private suspend fun handleLeave(packet: BitchatPacket, peerID: String) {
+ val content = String(packet.payload, Charsets.UTF_8)
+
+ if (content.startsWith("#")) {
+ // Channel leave
+ delegate?.didReceiveChannelLeave(content, peerID)
+ } else {
+ // Peer disconnect
+ activePeers.remove(peerID)
+ announcedPeers.remove(peerID)
+ peerNicknames[peerID]?.let { nickname ->
+ delegate?.didDisconnectFromPeer(nickname)
+ }
+ peerNicknames.remove(peerID)
+ notifyPeerListUpdate()
+ }
+
+ // Relay if TTL > 0
+ if (packet.ttl > 1u) {
+ val relayPacket = packet.copy(ttl = (packet.ttl - 1u).toUByte())
+ broadcastPacket(relayPacket)
+ }
+ }
+
+ /**
+ * Handle delivery acknowledgment
+ */
+ private suspend fun handleDeliveryAck(packet: BitchatPacket, peerID: String) {
+ if (packet.recipientID != null && String(packet.recipientID).replace("\u0000", "") == myPeerID) {
+ try {
+ val decryptedData = encryptionService.decrypt(packet.payload, peerID)
+ val ack = DeliveryAck.decode(decryptedData)
+ if (ack != null) {
+ delegate?.didReceiveDeliveryAck(ack)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to decrypt delivery ACK: ${e.message}")
+ }
+ } else if (packet.ttl > 0u) {
+ // Relay
+ val relayPacket = packet.copy(ttl = (packet.ttl - 1u).toUByte())
+ broadcastPacket(relayPacket)
+ }
+ }
+
+ /**
+ * Handle read receipt
+ */
+ private suspend fun handleReadReceipt(packet: BitchatPacket, peerID: String) {
+ if (packet.recipientID != null && String(packet.recipientID).replace("\u0000", "") == myPeerID) {
+ try {
+ val decryptedData = encryptionService.decrypt(packet.payload, peerID)
+ val receipt = ReadReceipt.decode(decryptedData)
+ if (receipt != null) {
+ delegate?.didReceiveReadReceipt(receipt)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to decrypt read receipt: ${e.message}")
+ }
+ } else if (packet.ttl > 0u) {
+ // Relay
+ val relayPacket = packet.copy(ttl = (packet.ttl - 1u).toUByte())
+ broadcastPacket(relayPacket)
+ }
+ }
+
+ /**
+ * Handle message fragments
+ */
+ private suspend fun handleFragment(packet: BitchatPacket, peerID: String) {
+ if (packet.payload.size < 13) return
+
+ try {
+ // Extract fragment metadata (same format as iOS)
+ val fragmentIDData = packet.payload.sliceArray(0..7)
+ val fragmentID = fragmentIDData.contentHashCode().toString()
+
+ val index = ((packet.payload[8].toInt() and 0xFF) shl 8) or (packet.payload[9].toInt() and 0xFF)
+ val total = ((packet.payload[10].toInt() and 0xFF) shl 8) or (packet.payload[11].toInt() and 0xFF)
+ val originalType = packet.payload[12].toUByte()
+ val fragmentData = packet.payload.sliceArray(13 until packet.payload.size)
+
+ // Store fragment
+ if (!incomingFragments.containsKey(fragmentID)) {
+ incomingFragments[fragmentID] = mutableMapOf()
+ fragmentMetadata[fragmentID] = Triple(originalType, total, System.currentTimeMillis())
+ }
+
+ incomingFragments[fragmentID]?.put(index, fragmentData)
+
+ // Check if we have all fragments
+ if (incomingFragments[fragmentID]?.size == total) {
+ // Reassemble message
+ val reassembledData = mutableListOf()
+ for (i in 0 until total) {
+ incomingFragments[fragmentID]?.get(i)?.let { data ->
+ reassembledData.addAll(data.asIterable())
+ }
+ }
+
+ // Parse and handle reassembled packet
+ val reassembledPacket = BitchatPacket.fromBinaryData(reassembledData.toByteArray())
+ if (reassembledPacket != null) {
+ handleReceivedPacket(reassembledPacket, peerID)
+ }
+
+ // Cleanup
+ incomingFragments.remove(fragmentID)
+ fragmentMetadata.remove(fragmentID)
+ }
+
+ // Relay fragment
+ if (packet.ttl > 0u) {
+ val relayPacket = packet.copy(ttl = (packet.ttl - 1u).toUByte())
+ broadcastPacket(relayPacket)
+ }
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to handle fragment: ${e.message}")
+ }
+
+ // Clean up old fragments (older than 30 seconds)
+ val cutoffTime = System.currentTimeMillis() - 30000
+ fragmentMetadata.entries.removeAll { (fragmentID, metadata) ->
+ if (metadata.third < cutoffTime) {
+ incomingFragments.remove(fragmentID)
+ true
+ } else {
+ false
+ }
+ }
+ }
+
+ /**
+ * Relay message with adaptive probability (same as iOS)
+ */
+ private suspend fun relayMessage(packet: BitchatPacket) {
+ if (packet.ttl == 0u.toUByte()) return
+
+ val relayPacket = packet.copy(ttl = (packet.ttl - 1u).toUByte())
+
+ // Adaptive relay probability based on network size
+ val networkSize = activePeers.size
+ val relayProb = when {
+ networkSize <= 10 -> 1.0
+ networkSize <= 30 -> 0.85
+ networkSize <= 50 -> 0.7
+ networkSize <= 100 -> 0.55
+ else -> 0.4
+ }
+
+ val shouldRelay = relayPacket.ttl >= 4u || networkSize <= 3 || Random.nextDouble() < relayProb
+
+ if (shouldRelay) {
+ val delay = Random.nextLong(50, 500) // Random delay like iOS
+ delay(delay)
+ broadcastPacket(relayPacket)
+ }
+ }
+
+ /**
+ * Broadcast packet to all connected peers - FIXED to work with both server and client modes
+ */
+ fun broadcastPacket(packet: BitchatPacket) {
+ val data = packet.toBinaryData() ?: return
+
+ Log.d(TAG, "Broadcasting packet type ${packet.type} to ${subscribedDevices.size} server connections and ${gattConnections.size} client connections")
+
+ // Send to connected devices in server mode (devices connected to our GATT server)
+ subscribedDevices.forEach { device ->
+ try {
+ characteristic?.let { char ->
+ char.value = data
+ val success = gattServer?.notifyCharacteristicChanged(device, char, false) ?: false
+ if (success) {
+ Log.d(TAG, "Sent packet to server connection: ${device.address}")
+ } else {
+ Log.w(TAG, "Failed to send packet to server connection: ${device.address}")
+ }
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "Error sending to server connection ${device.address}: ${e.message}")
+ }
+ }
+
+ // Send to connected devices in client mode (we are connected to their GATT servers)
+ gattConnections.forEach { (device, gatt) ->
+ try {
+ val characteristic = deviceCharacteristics[device]
+ if (characteristic != null) {
+ characteristic.value = data
+ val success = gatt.writeCharacteristic(characteristic)
+ if (success) {
+ Log.d(TAG, "Sent packet to client connection: ${device.address}")
+ } else {
+ Log.w(TAG, "Failed to send packet to client connection: ${device.address}")
+ }
+ } else {
+ Log.w(TAG, "No characteristic found for client connection: ${device.address}")
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "Error sending to client connection ${device.address}: ${e.message}")
+ }
+ }
+ }
+
+ /**
+ * Send public message
+ */
+ fun sendMessage(content: String, mentions: List = emptyList(), channel: String? = null) {
+ if (content.isEmpty()) return
+
+ serviceScope.launch {
+ val nickname = delegate?.getNickname() ?: myPeerID
+
+ val message = BitchatMessage(
+ sender = nickname,
+ content = content,
+ timestamp = Date(),
+ isRelay = false,
+ senderPeerID = myPeerID,
+ mentions = if (mentions.isNotEmpty()) mentions else null,
+ channel = channel
+ )
+
+ message.toBinaryPayload()?.let { messageData ->
+ // Sign the message
+ val signature = try {
+ encryptionService.sign(messageData)
+ } catch (e: Exception) {
+ null
+ }
+
+ val packet = BitchatPacket(
+ type = MessageType.MESSAGE.value,
+ senderID = myPeerID.toByteArray(),
+ recipientID = SpecialRecipients.BROADCAST,
+ timestamp = System.currentTimeMillis().toULong(),
+ payload = messageData,
+ signature = signature,
+ ttl = MAX_TTL
+ )
+
+ // Add random delay and send
+ delay(Random.nextLong(50, 500))
+ broadcastPacket(packet)
+
+ // Single retry for reliability
+ delay(300 + Random.nextLong(0, 200))
+ broadcastPacket(packet)
+ }
+ }
+ }
+
+ /**
+ * Send private message
+ */
+ fun sendPrivateMessage(content: String, recipientPeerID: String, recipientNickname: String, messageID: String? = null) {
+ if (content.isEmpty() || recipientPeerID.isEmpty() || recipientNickname.isEmpty()) return
+
+ serviceScope.launch {
+ val nickname = delegate?.getNickname() ?: myPeerID
+
+ val message = BitchatMessage(
+ id = messageID ?: UUID.randomUUID().toString(),
+ sender = nickname,
+ content = content,
+ timestamp = Date(),
+ isRelay = false,
+ isPrivate = true,
+ recipientNickname = recipientNickname,
+ senderPeerID = myPeerID
+ )
+
+ message.toBinaryPayload()?.let { messageData ->
+ try {
+ // Pad and encrypt
+ val blockSize = MessagePadding.optimalBlockSize(messageData.size)
+ val paddedData = MessagePadding.pad(messageData, blockSize)
+ val encryptedPayload = encryptionService.encrypt(paddedData, recipientPeerID)
+
+ // Sign
+ val signature = try {
+ encryptionService.sign(encryptedPayload)
+ } catch (e: Exception) {
+ null
+ }
+
+ val packet = BitchatPacket(
+ type = MessageType.MESSAGE.value,
+ senderID = myPeerID.toByteArray(),
+ recipientID = recipientPeerID.toByteArray(),
+ timestamp = System.currentTimeMillis().toULong(),
+ payload = encryptedPayload,
+ signature = signature,
+ ttl = MAX_TTL
+ )
+
+ // Check if recipient is offline and cache for favorites
+ if (!activePeers.containsKey(recipientPeerID)) {
+ val isRecipientFavorite = delegate?.isFavorite(recipientPeerID) ?: false
+ if (isRecipientFavorite) {
+ cacheMessage(packet, messageID ?: message.id)
+ }
+ }
+
+ // Send with delay
+ delay(Random.nextLong(50, 500))
+ broadcastPacket(packet)
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to send private message: ${e.message}")
+ }
+ }
+ }
+ }
+
+ /**
+ * Cache message for offline delivery
+ */
+ private fun cacheMessage(packet: BitchatPacket, messageID: String) {
+ // Skip certain message types (same as iOS)
+ if (packet.type == MessageType.KEY_EXCHANGE.value ||
+ packet.type == MessageType.ANNOUNCE.value ||
+ packet.type == MessageType.LEAVE.value) {
+ return
+ }
+
+ // Don't cache broadcast messages
+ if (packet.recipientID != null && packet.recipientID.contentEquals(SpecialRecipients.BROADCAST)) {
+ return
+ }
+
+ val isForFavorite = packet.recipientID?.let { recipientID ->
+ val recipientPeerID = String(recipientID).replace("\u0000", "")
+ delegate?.isFavorite(recipientPeerID) ?: false
+ } ?: false
+
+ val storedMessage = StoredMessage(
+ packet = packet,
+ timestamp = System.currentTimeMillis(),
+ messageID = messageID,
+ isForFavorite = isForFavorite
+ )
+
+ if (isForFavorite && packet.recipientID != null) {
+ val recipientPeerID = String(packet.recipientID).replace("\u0000", "")
+ if (!favoriteMessageQueue.containsKey(recipientPeerID)) {
+ favoriteMessageQueue[recipientPeerID] = mutableListOf()
+ }
+ favoriteMessageQueue[recipientPeerID]?.add(storedMessage)
+
+ // Limit favorite queue size
+ if (favoriteMessageQueue[recipientPeerID]?.size ?: 0 > MAX_CACHED_MESSAGES_FAVORITES) {
+ favoriteMessageQueue[recipientPeerID]?.removeAt(0)
+ }
+ } else {
+ // Clean up old messages first
+ cleanupMessageCache()
+
+ messageCache.add(storedMessage)
+
+ // Limit cache size
+ if (messageCache.size > MAX_CACHED_MESSAGES) {
+ messageCache.removeAt(0)
+ }
+ }
+ }
+
+ /**
+ * Send cached messages to peer
+ */
+ private fun sendCachedMessages(peerID: String) {
+ if (cachedMessagesSentToPeer.contains(peerID)) {
+ return // Already sent cached messages to this peer
+ }
+
+ cachedMessagesSentToPeer.add(peerID)
+
+ serviceScope.launch {
+ cleanupMessageCache()
+
+ val messagesToSend = mutableListOf()
+
+ // Check favorite queue
+ favoriteMessageQueue[peerID]?.let { favoriteMessages ->
+ val undeliveredFavorites = favoriteMessages.filter { !deliveredMessages.contains(it.messageID) }
+ messagesToSend.addAll(undeliveredFavorites)
+ favoriteMessageQueue.remove(peerID)
+ }
+
+ // Filter regular cached messages for this recipient
+ val recipientMessages = messageCache.filter { storedMessage ->
+ !deliveredMessages.contains(storedMessage.messageID) &&
+ storedMessage.packet.recipientID?.let { recipientID ->
+ String(recipientID).replace("\u0000", "") == peerID
+ } == true
+ }
+ messagesToSend.addAll(recipientMessages)
+
+ // Sort by timestamp
+ messagesToSend.sortBy { it.timestamp }
+
+ if (messagesToSend.isNotEmpty()) {
+ Log.d(TAG, "Sending ${messagesToSend.size} cached messages to $peerID")
+ }
+
+ // Mark as delivered
+ val messageIDsToRemove = messagesToSend.map { it.messageID }
+ deliveredMessages.addAll(messageIDsToRemove)
+
+ // Send with delays
+ messagesToSend.forEachIndexed { index, storedMessage ->
+ delay(index * 100L) // 100ms between messages
+ broadcastPacket(storedMessage.packet)
+ }
+
+ // Remove sent messages
+ messageCache.removeAll { messageIDsToRemove.contains(it.messageID) }
+ }
+ }
+
+ /**
+ * Clean up old cached messages
+ */
+ private fun cleanupMessageCache() {
+ val cutoffTime = System.currentTimeMillis() - MESSAGE_CACHE_TIMEOUT
+ messageCache.removeAll { !it.isForFavorite && it.timestamp < cutoffTime }
+
+ // Clean up delivered messages set
+ if (deliveredMessages.size > 1000) {
+ deliveredMessages.clear()
+ }
+ }
+
+ /**
+ * Send delivery acknowledgment
+ */
+ private fun sendDeliveryAck(message: BitchatMessage, senderPeerID: String) {
+ serviceScope.launch {
+ val nickname = delegate?.getNickname() ?: myPeerID
+ val ack = DeliveryAck(
+ originalMessageID = message.id,
+ recipientID = myPeerID,
+ recipientNickname = nickname,
+ hopCount = (MAX_TTL - 0u).toUByte() // Placeholder hop count
+ )
+
+ try {
+ val ackData = ack.encode() ?: return@launch
+ val encryptedPayload = encryptionService.encrypt(ackData, senderPeerID)
+
+ val packet = BitchatPacket(
+ type = MessageType.DELIVERY_ACK.value,
+ senderID = myPeerID.toByteArray(),
+ recipientID = senderPeerID.toByteArray(),
+ timestamp = System.currentTimeMillis().toULong(),
+ payload = encryptedPayload,
+ signature = null,
+ ttl = 3u
+ )
+
+ broadcastPacket(packet)
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to send delivery ACK: ${e.message}")
+ }
+ }
+ }
+
+ /**
+ * Send broadcast announce
+ */
+ fun sendBroadcastAnnounce() {
+ serviceScope.launch {
+ val nickname = delegate?.getNickname() ?: myPeerID
+
+ val announcePacket = BitchatPacket(
+ type = MessageType.ANNOUNCE.value,
+ ttl = 3u,
+ senderID = myPeerID,
+ payload = nickname.toByteArray()
+ )
+
+ // Send multiple times for reliability
+ delay(Random.nextLong(0, 500))
+ broadcastPacket(announcePacket)
+
+ delay(500 + Random.nextLong(0, 500))
+ broadcastPacket(announcePacket)
+
+ delay(1000 + Random.nextLong(0, 500))
+ broadcastPacket(announcePacket)
+ }
+ }
+
+ /**
+ * Send announcement to specific peer
+ */
+ private fun sendAnnouncementToPeer(peerID: String) {
+ if (announcedToPeers.contains(peerID)) return
+
+ val nickname = delegate?.getNickname() ?: myPeerID
+ val packet = BitchatPacket(
+ type = MessageType.ANNOUNCE.value,
+ ttl = 3u,
+ senderID = myPeerID,
+ payload = nickname.toByteArray()
+ )
+
+ broadcastPacket(packet)
+ announcedToPeers.add(peerID)
+ }
+
+ /**
+ * Send leave announcement
+ */
+ private fun sendLeaveAnnouncement() {
+ val nickname = delegate?.getNickname() ?: myPeerID
+ val packet = BitchatPacket(
+ type = MessageType.LEAVE.value,
+ ttl = 1u,
+ senderID = myPeerID,
+ payload = nickname.toByteArray()
+ )
+
+ broadcastPacket(packet)
+ }
+
+ /**
+ * Get peer nicknames
+ */
+ fun getPeerNicknames(): Map = peerNicknames.toMap()
+
+ /**
+ * Get peer RSSI values
+ */
+ fun getPeerRSSI(): Map = peerRSSI.toMap()
+
+ /**
+ * Get debug status information - ADDED for troubleshooting
+ */
+ fun getDebugStatus(): String {
+ return buildString {
+ appendLine("=== Bluetooth Mesh Service Debug Status ===")
+ appendLine("My Peer ID: $myPeerID")
+ appendLine("Bluetooth Enabled: ${bluetoothAdapter?.isEnabled}")
+ appendLine("Has Permissions: ${hasBluetoothPermissions()}")
+ appendLine("BLE Scanner Available: ${bleScanner != null}")
+ appendLine("BLE Advertiser Available: ${bleAdvertiser != null}")
+ appendLine("GATT Server Active: ${gattServer != null}")
+ appendLine()
+ appendLine("Connected Devices: ${connectedDevices.size}")
+ connectedDevices.forEach { (address, device) ->
+ appendLine(" - $address")
+ }
+ appendLine()
+ appendLine("GATT Connections: ${gattConnections.size}")
+ gattConnections.keys.forEach { device ->
+ appendLine(" - ${device.address}")
+ }
+ appendLine()
+ appendLine("Subscribed Devices: ${subscribedDevices.size}")
+ subscribedDevices.forEach { device ->
+ appendLine(" - ${device.address}")
+ }
+ appendLine()
+ appendLine("Active Peers: ${activePeers.size}")
+ activePeers.forEach { (peerID, lastSeen) ->
+ val nickname = peerNicknames[peerID] ?: "Unknown"
+ val timeSince = (System.currentTimeMillis() - lastSeen) / 1000
+ appendLine(" - $peerID ($nickname) - last seen ${timeSince}s ago")
+ }
+ appendLine()
+ appendLine("Peer RSSI Values: ${peerRSSI.size}")
+ peerRSSI.forEach { (peerID, rssi) ->
+ appendLine(" - $peerID: $rssi dBm")
+ }
+ }
+ }
+
+ /**
+ * Notify delegate of peer list updates
+ */
+ private fun notifyPeerListUpdate() {
+ val peerList = activePeers.keys.toList().sorted()
+ delegate?.didUpdatePeerList(peerList)
+ }
+
+ /**
+ * Start periodic tasks
+ */
+ private fun startPeriodicTasks() {
+ // Cleanup stale peers every minute
+ serviceScope.launch {
+ while (isActive) {
+ delay(60000) // 1 minute
+ cleanupStalePeers()
+ }
+ }
+
+ // Reset processed messages every 5 minutes
+ serviceScope.launch {
+ while (isActive) {
+ delay(300000) // 5 minutes
+ processedMessages.clear()
+ processedKeyExchanges.clear()
+ }
+ }
+ }
+
+ /**
+ * Clean up stale peers (same 3-minute threshold as iOS)
+ */
+ private fun cleanupStalePeers() {
+ val staleThreshold = 180000L // 3 minutes
+ val now = System.currentTimeMillis()
+
+ val peersToRemove = activePeers.entries.filter { (_, lastSeen) ->
+ now - lastSeen > staleThreshold
+ }.map { it.key }
+
+ peersToRemove.forEach { peerID ->
+ activePeers.remove(peerID)
+ peerNicknames[peerID]?.let { nickname ->
+ delegate?.didDisconnectFromPeer(nickname)
+ }
+ peerNicknames.remove(peerID)
+ peerRSSI.remove(peerID)
+ announcedPeers.remove(peerID)
+ announcedToPeers.remove(peerID)
+ }
+
+ if (peersToRemove.isNotEmpty()) {
+ notifyPeerListUpdate()
+ }
+ }
+}
+
+/**
+ * Delegate interface for mesh service callbacks
+ */
+interface BluetoothMeshDelegate {
+ fun didReceiveMessage(message: BitchatMessage)
+ fun didConnectToPeer(peerID: String)
+ fun didDisconnectFromPeer(peerID: String)
+ fun didUpdatePeerList(peers: List)
+ fun didReceiveChannelLeave(channel: String, fromPeer: String)
+ fun didReceiveDeliveryAck(ack: DeliveryAck)
+ fun didReceiveReadReceipt(receipt: ReadReceipt)
+ 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/model/BitchatMessage.kt b/app/src/main/java/com/bitchat/android/model/BitchatMessage.kt
new file mode 100644
index 00000000..19082b75
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/model/BitchatMessage.kt
@@ -0,0 +1,407 @@
+package com.bitchat.android.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.util.*
+
+/**
+ * Delivery status for messages - exact same as iOS version
+ */
+sealed class DeliveryStatus : Parcelable {
+ @Parcelize
+ object Sending : DeliveryStatus()
+
+ @Parcelize
+ object Sent : DeliveryStatus()
+
+ @Parcelize
+ data class Delivered(val to: String, val at: Date) : DeliveryStatus()
+
+ @Parcelize
+ data class Read(val by: String, val at: Date) : DeliveryStatus()
+
+ @Parcelize
+ data class Failed(val reason: String) : DeliveryStatus()
+
+ @Parcelize
+ data class PartiallyDelivered(val reached: Int, val total: Int) : DeliveryStatus()
+
+ fun getDisplayText(): String {
+ return when (this) {
+ is Sending -> "Sending..."
+ is Sent -> "Sent"
+ is Delivered -> "Delivered to ${this.to}"
+ is Read -> "Read by ${this.by}"
+ is Failed -> "Failed: ${this.reason}"
+ is PartiallyDelivered -> "Delivered to ${this.reached}/${this.total}"
+ }
+ }
+}
+
+/**
+ * BitchatMessage - 100% compatible with iOS version
+ */
+@Parcelize
+data class BitchatMessage(
+ val id: String = UUID.randomUUID().toString(),
+ val sender: String,
+ val content: String,
+ val timestamp: Date,
+ val isRelay: Boolean = false,
+ val originalSender: String? = null,
+ val isPrivate: Boolean = false,
+ val recipientNickname: String? = null,
+ val senderPeerID: String? = null,
+ val mentions: List? = null,
+ val channel: String? = null,
+ val encryptedContent: ByteArray? = null,
+ val isEncrypted: Boolean = false,
+ val deliveryStatus: DeliveryStatus? = null
+) : Parcelable {
+
+ /**
+ * Convert message to binary payload format - exactly same as iOS version
+ */
+ fun toBinaryPayload(): ByteArray? {
+ try {
+ val buffer = ByteBuffer.allocate(4096).apply { order(ByteOrder.BIG_ENDIAN) }
+
+ // Message format:
+ // - Flags: 1 byte (bit flags for optional fields)
+ // - Timestamp: 8 bytes (milliseconds since epoch, big-endian)
+ // - ID length: 1 byte + ID data
+ // - Sender length: 1 byte + sender data
+ // - Content length: 2 bytes + content data (or encrypted content)
+ // Optional fields based on flags...
+
+ var flags: UByte = 0u
+ if (isRelay) flags = flags or 0x01u
+ if (isPrivate) flags = flags or 0x02u
+ if (originalSender != null) flags = flags or 0x04u
+ if (recipientNickname != null) flags = flags or 0x08u
+ if (senderPeerID != null) flags = flags or 0x10u
+ if (mentions != null && mentions.isNotEmpty()) flags = flags or 0x20u
+ if (channel != null) flags = flags or 0x40u
+ if (isEncrypted) flags = flags or 0x80u
+
+ buffer.put(flags.toByte())
+
+ // Timestamp (in milliseconds, 8 bytes big-endian)
+ val timestampMillis = timestamp.time
+ buffer.putLong(timestampMillis)
+
+ // ID
+ val idBytes = id.toByteArray(Charsets.UTF_8)
+ buffer.put(minOf(idBytes.size, 255).toByte())
+ buffer.put(idBytes.take(255).toByteArray())
+
+ // Sender
+ val senderBytes = sender.toByteArray(Charsets.UTF_8)
+ buffer.put(minOf(senderBytes.size, 255).toByte())
+ buffer.put(senderBytes.take(255).toByteArray())
+
+ // Content or encrypted content
+ if (isEncrypted && encryptedContent != null) {
+ val length = minOf(encryptedContent.size, 65535)
+ buffer.putShort(length.toShort())
+ buffer.put(encryptedContent.take(length).toByteArray())
+ } else {
+ val contentBytes = content.toByteArray(Charsets.UTF_8)
+ val length = minOf(contentBytes.size, 65535)
+ buffer.putShort(length.toShort())
+ buffer.put(contentBytes.take(length).toByteArray())
+ }
+
+ // Optional fields
+ originalSender?.let { origSender ->
+ val origBytes = origSender.toByteArray(Charsets.UTF_8)
+ buffer.put(minOf(origBytes.size, 255).toByte())
+ buffer.put(origBytes.take(255).toByteArray())
+ }
+
+ recipientNickname?.let { recipient ->
+ val recipBytes = recipient.toByteArray(Charsets.UTF_8)
+ buffer.put(minOf(recipBytes.size, 255).toByte())
+ buffer.put(recipBytes.take(255).toByteArray())
+ }
+
+ senderPeerID?.let { peerID ->
+ val peerBytes = peerID.toByteArray(Charsets.UTF_8)
+ buffer.put(minOf(peerBytes.size, 255).toByte())
+ buffer.put(peerBytes.take(255).toByteArray())
+ }
+
+ // Mentions array
+ mentions?.let { mentionList ->
+ buffer.put(minOf(mentionList.size, 255).toByte())
+ mentionList.take(255).forEach { mention ->
+ val mentionBytes = mention.toByteArray(Charsets.UTF_8)
+ buffer.put(minOf(mentionBytes.size, 255).toByte())
+ buffer.put(mentionBytes.take(255).toByteArray())
+ }
+ }
+
+ // Channel hashtag
+ channel?.let { channelName ->
+ val channelBytes = channelName.toByteArray(Charsets.UTF_8)
+ buffer.put(minOf(channelBytes.size, 255).toByte())
+ buffer.put(channelBytes.take(255).toByteArray())
+ }
+
+ val result = ByteArray(buffer.position())
+ buffer.rewind()
+ buffer.get(result)
+ return result
+
+ } catch (e: Exception) {
+ return null
+ }
+ }
+
+ companion object {
+ /**
+ * Parse message from binary payload - exactly same logic as iOS version
+ */
+ fun fromBinaryPayload(data: ByteArray): BitchatMessage? {
+ try {
+ if (data.size < 13) return null
+
+ val buffer = ByteBuffer.wrap(data).apply { order(ByteOrder.BIG_ENDIAN) }
+
+ // Flags
+ val flags = buffer.get().toUByte()
+ val isRelay = (flags and 0x01u) != 0u.toUByte()
+ val isPrivate = (flags and 0x02u) != 0u.toUByte()
+ val hasOriginalSender = (flags and 0x04u) != 0u.toUByte()
+ val hasRecipientNickname = (flags and 0x08u) != 0u.toUByte()
+ val hasSenderPeerID = (flags and 0x10u) != 0u.toUByte()
+ val hasMentions = (flags and 0x20u) != 0u.toUByte()
+ val hasChannel = (flags and 0x40u) != 0u.toUByte()
+ val isEncrypted = (flags and 0x80u) != 0u.toUByte()
+
+ // Timestamp
+ val timestampMillis = buffer.getLong()
+ val timestamp = Date(timestampMillis)
+
+ // ID
+ val idLength = buffer.get().toInt() and 0xFF
+ if (buffer.remaining() < idLength) return null
+ val idBytes = ByteArray(idLength)
+ buffer.get(idBytes)
+ val id = String(idBytes, Charsets.UTF_8)
+
+ // Sender
+ val senderLength = buffer.get().toInt() and 0xFF
+ if (buffer.remaining() < senderLength) return null
+ val senderBytes = ByteArray(senderLength)
+ buffer.get(senderBytes)
+ val sender = String(senderBytes, Charsets.UTF_8)
+
+ // Content
+ val contentLength = buffer.getShort().toInt() and 0xFFFF
+ if (buffer.remaining() < contentLength) return null
+
+ val content: String
+ val encryptedContent: ByteArray?
+
+ if (isEncrypted) {
+ val encryptedBytes = ByteArray(contentLength)
+ buffer.get(encryptedBytes)
+ encryptedContent = encryptedBytes
+ content = "" // Empty placeholder
+ } else {
+ val contentBytes = ByteArray(contentLength)
+ buffer.get(contentBytes)
+ content = String(contentBytes, Charsets.UTF_8)
+ encryptedContent = null
+ }
+
+ // Optional fields
+ val originalSender = if (hasOriginalSender && buffer.hasRemaining()) {
+ val length = buffer.get().toInt() and 0xFF
+ if (buffer.remaining() >= length) {
+ val bytes = ByteArray(length)
+ buffer.get(bytes)
+ String(bytes, Charsets.UTF_8)
+ } else null
+ } else null
+
+ val recipientNickname = if (hasRecipientNickname && buffer.hasRemaining()) {
+ val length = buffer.get().toInt() and 0xFF
+ if (buffer.remaining() >= length) {
+ val bytes = ByteArray(length)
+ buffer.get(bytes)
+ String(bytes, Charsets.UTF_8)
+ } else null
+ } else null
+
+ val senderPeerID = if (hasSenderPeerID && buffer.hasRemaining()) {
+ val length = buffer.get().toInt() and 0xFF
+ if (buffer.remaining() >= length) {
+ val bytes = ByteArray(length)
+ buffer.get(bytes)
+ String(bytes, Charsets.UTF_8)
+ } else null
+ } else null
+
+ // Mentions array
+ val mentions = if (hasMentions && buffer.hasRemaining()) {
+ val mentionCount = buffer.get().toInt() and 0xFF
+ val mentionList = mutableListOf()
+ repeat(mentionCount) {
+ if (buffer.hasRemaining()) {
+ val length = buffer.get().toInt() and 0xFF
+ if (buffer.remaining() >= length) {
+ val bytes = ByteArray(length)
+ buffer.get(bytes)
+ mentionList.add(String(bytes, Charsets.UTF_8))
+ }
+ }
+ }
+ if (mentionList.isNotEmpty()) mentionList else null
+ } else null
+
+ // Channel
+ val channel = if (hasChannel && buffer.hasRemaining()) {
+ val length = buffer.get().toInt() and 0xFF
+ if (buffer.remaining() >= length) {
+ val bytes = ByteArray(length)
+ buffer.get(bytes)
+ String(bytes, Charsets.UTF_8)
+ } else null
+ } else null
+
+ return BitchatMessage(
+ id = id,
+ sender = sender,
+ content = content,
+ timestamp = timestamp,
+ isRelay = isRelay,
+ originalSender = originalSender,
+ isPrivate = isPrivate,
+ recipientNickname = recipientNickname,
+ senderPeerID = senderPeerID,
+ mentions = mentions,
+ channel = channel,
+ encryptedContent = encryptedContent,
+ isEncrypted = isEncrypted
+ )
+
+ } catch (e: Exception) {
+ return null
+ }
+ }
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as BitchatMessage
+
+ if (id != other.id) return false
+ if (sender != other.sender) return false
+ if (content != other.content) return false
+ if (timestamp != other.timestamp) return false
+ if (isRelay != other.isRelay) return false
+ if (originalSender != other.originalSender) return false
+ if (isPrivate != other.isPrivate) return false
+ if (recipientNickname != other.recipientNickname) return false
+ if (senderPeerID != other.senderPeerID) return false
+ if (mentions != other.mentions) return false
+ if (channel != other.channel) return false
+ if (encryptedContent != null) {
+ if (other.encryptedContent == null) return false
+ if (!encryptedContent.contentEquals(other.encryptedContent)) return false
+ } else if (other.encryptedContent != null) return false
+ if (isEncrypted != other.isEncrypted) return false
+ if (deliveryStatus != other.deliveryStatus) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = id.hashCode()
+ result = 31 * result + sender.hashCode()
+ result = 31 * result + content.hashCode()
+ result = 31 * result + timestamp.hashCode()
+ result = 31 * result + isRelay.hashCode()
+ result = 31 * result + (originalSender?.hashCode() ?: 0)
+ result = 31 * result + isPrivate.hashCode()
+ result = 31 * result + (recipientNickname?.hashCode() ?: 0)
+ result = 31 * result + (senderPeerID?.hashCode() ?: 0)
+ result = 31 * result + (mentions?.hashCode() ?: 0)
+ result = 31 * result + (channel?.hashCode() ?: 0)
+ result = 31 * result + (encryptedContent?.contentHashCode() ?: 0)
+ result = 31 * result + isEncrypted.hashCode()
+ result = 31 * result + (deliveryStatus?.hashCode() ?: 0)
+ return result
+ }
+}
+
+/**
+ * Delivery acknowledgment structure - exact same as iOS version
+ */
+@Parcelize
+data class DeliveryAck(
+ val originalMessageID: String,
+ val ackID: String = UUID.randomUUID().toString(),
+ val recipientID: String,
+ val recipientNickname: String,
+ val timestamp: Date = Date(),
+ val hopCount: UByte
+) : Parcelable {
+
+ fun encode(): ByteArray? {
+ return try {
+ com.google.gson.Gson().toJson(this).toByteArray(Charsets.UTF_8)
+ } catch (e: Exception) {
+ null
+ }
+ }
+
+ companion object {
+ fun decode(data: ByteArray): DeliveryAck? {
+ return try {
+ val json = String(data, Charsets.UTF_8)
+ com.google.gson.Gson().fromJson(json, DeliveryAck::class.java)
+ } catch (e: Exception) {
+ null
+ }
+ }
+ }
+}
+
+/**
+ * Read receipt structure - exact same as iOS version
+ */
+@Parcelize
+data class ReadReceipt(
+ val originalMessageID: String,
+ val receiptID: String = UUID.randomUUID().toString(),
+ val readerID: String,
+ val readerNickname: String,
+ val timestamp: Date = Date()
+) : Parcelable {
+
+ fun encode(): ByteArray? {
+ return try {
+ com.google.gson.Gson().toJson(this).toByteArray(Charsets.UTF_8)
+ } catch (e: Exception) {
+ null
+ }
+ }
+
+ companion object {
+ fun decode(data: ByteArray): ReadReceipt? {
+ return try {
+ val json = String(data, Charsets.UTF_8)
+ com.google.gson.Gson().fromJson(json, ReadReceipt::class.java)
+ } catch (e: Exception) {
+ null
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/protocol/BinaryProtocol.kt b/app/src/main/java/com/bitchat/android/protocol/BinaryProtocol.kt
new file mode 100644
index 00000000..bb39a775
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/protocol/BinaryProtocol.kt
@@ -0,0 +1,334 @@
+package com.bitchat.android.protocol
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.util.*
+
+/**
+ * Message types - exact same as iOS version
+ */
+enum class MessageType(val value: UByte) {
+ ANNOUNCE(0x01u),
+ KEY_EXCHANGE(0x02u),
+ LEAVE(0x03u),
+ MESSAGE(0x04u),
+ FRAGMENT_START(0x05u),
+ FRAGMENT_CONTINUE(0x06u),
+ FRAGMENT_END(0x07u),
+ CHANNEL_ANNOUNCE(0x08u),
+ CHANNEL_RETENTION(0x09u),
+ DELIVERY_ACK(0x0Au),
+ DELIVERY_STATUS_REQUEST(0x0Bu),
+ READ_RECEIPT(0x0Cu);
+
+ companion object {
+ fun fromValue(value: UByte): MessageType? {
+ return values().find { it.value == value }
+ }
+ }
+}
+
+/**
+ * Special recipient IDs - exact same as iOS version
+ */
+object SpecialRecipients {
+ val BROADCAST = ByteArray(8) { 0xFF.toByte() } // All 0xFF = broadcast
+}
+
+/**
+ * Binary packet format - 100% compatible with iOS version
+ *
+ * Header (Fixed 13 bytes):
+ * - Version: 1 byte
+ * - Type: 1 byte
+ * - TTL: 1 byte
+ * - Timestamp: 8 bytes (UInt64, big-endian)
+ * - Flags: 1 byte (bit 0: hasRecipient, bit 1: hasSignature, bit 2: isCompressed)
+ * - PayloadLength: 2 bytes (UInt16, big-endian)
+ *
+ * Variable sections:
+ * - SenderID: 8 bytes (fixed)
+ * - RecipientID: 8 bytes (if hasRecipient flag set)
+ * - Payload: Variable length (includes original size if compressed)
+ * - Signature: 64 bytes (if hasSignature flag set)
+ */
+@Parcelize
+data class BitchatPacket(
+ val version: UByte = 1u,
+ val type: UByte,
+ val senderID: ByteArray,
+ val recipientID: ByteArray? = null,
+ val timestamp: ULong,
+ val payload: ByteArray,
+ val signature: ByteArray? = null,
+ var ttl: UByte
+) : Parcelable {
+
+ constructor(
+ type: UByte,
+ ttl: UByte,
+ senderID: String,
+ payload: ByteArray
+ ) : this(
+ version = 1u,
+ type = type,
+ senderID = senderID.toByteArray(),
+ recipientID = null,
+ timestamp = (System.currentTimeMillis()).toULong(),
+ payload = payload,
+ signature = null,
+ ttl = ttl
+ )
+
+ fun toBinaryData(): ByteArray? {
+ return BinaryProtocol.encode(this)
+ }
+
+ companion object {
+ fun fromBinaryData(data: ByteArray): BitchatPacket? {
+ return BinaryProtocol.decode(data)
+ }
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as BitchatPacket
+
+ if (version != other.version) return false
+ if (type != other.type) return false
+ if (!senderID.contentEquals(other.senderID)) return false
+ if (recipientID != null) {
+ if (other.recipientID == null) return false
+ if (!recipientID.contentEquals(other.recipientID)) return false
+ } else if (other.recipientID != null) return false
+ if (timestamp != other.timestamp) return false
+ if (!payload.contentEquals(other.payload)) return false
+ if (signature != null) {
+ if (other.signature == null) return false
+ if (!signature.contentEquals(other.signature)) return false
+ } else if (other.signature != null) return false
+ if (ttl != other.ttl) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = version.hashCode()
+ result = 31 * result + type.hashCode()
+ result = 31 * result + senderID.contentHashCode()
+ result = 31 * result + (recipientID?.contentHashCode() ?: 0)
+ result = 31 * result + timestamp.hashCode()
+ result = 31 * result + payload.contentHashCode()
+ result = 31 * result + (signature?.contentHashCode() ?: 0)
+ result = 31 * result + ttl.hashCode()
+ return result
+ }
+}
+
+/**
+ * Binary Protocol implementation - exact same format as iOS version
+ */
+object BinaryProtocol {
+ private const val HEADER_SIZE = 13
+ private const val SENDER_ID_SIZE = 8
+ private const val RECIPIENT_ID_SIZE = 8
+ private const val SIGNATURE_SIZE = 64
+
+ object Flags {
+ const val HAS_RECIPIENT: UByte = 0x01u
+ const val HAS_SIGNATURE: UByte = 0x02u
+ const val IS_COMPRESSED: UByte = 0x04u
+ }
+
+ fun encode(packet: BitchatPacket): ByteArray? {
+ try {
+ // Try to compress payload if beneficial
+ var payload = packet.payload
+ var originalPayloadSize: UShort? = null
+ var isCompressed = false
+
+ if (CompressionUtil.shouldCompress(payload)) {
+ CompressionUtil.compress(payload)?.let { compressedPayload ->
+ originalPayloadSize = payload.size.toUShort()
+ payload = compressedPayload
+ isCompressed = true
+ }
+ }
+
+ val buffer = ByteBuffer.allocate(4096).apply { order(ByteOrder.BIG_ENDIAN) }
+
+ // Header
+ buffer.put(packet.version.toByte())
+ buffer.put(packet.type.toByte())
+ buffer.put(packet.ttl.toByte())
+
+ // Timestamp (8 bytes, big-endian)
+ buffer.putLong(packet.timestamp.toLong())
+
+ // Flags
+ var flags: UByte = 0u
+ if (packet.recipientID != null) {
+ flags = flags or Flags.HAS_RECIPIENT
+ }
+ if (packet.signature != null) {
+ flags = flags or Flags.HAS_SIGNATURE
+ }
+ if (isCompressed) {
+ flags = flags or Flags.IS_COMPRESSED
+ }
+ buffer.put(flags.toByte())
+
+ // Payload length (2 bytes, big-endian) - includes original size if compressed
+ val payloadDataSize = payload.size + if (isCompressed) 2 else 0
+ buffer.putShort(payloadDataSize.toShort())
+
+ // SenderID (exactly 8 bytes)
+ val senderBytes = packet.senderID.take(SENDER_ID_SIZE).toByteArray()
+ buffer.put(senderBytes)
+ if (senderBytes.size < SENDER_ID_SIZE) {
+ buffer.put(ByteArray(SENDER_ID_SIZE - senderBytes.size))
+ }
+
+ // RecipientID (if present)
+ packet.recipientID?.let { recipientID ->
+ val recipientBytes = recipientID.take(RECIPIENT_ID_SIZE).toByteArray()
+ buffer.put(recipientBytes)
+ if (recipientBytes.size < RECIPIENT_ID_SIZE) {
+ buffer.put(ByteArray(RECIPIENT_ID_SIZE - recipientBytes.size))
+ }
+ }
+
+ // Payload (with original size prepended if compressed)
+ if (isCompressed) {
+ val originalSize = originalPayloadSize
+ if (originalSize != null) {
+ buffer.putShort(originalSize.toShort())
+ }
+ }
+ buffer.put(payload)
+
+ // Signature (if present)
+ packet.signature?.let { signature ->
+ buffer.put(signature.take(SIGNATURE_SIZE).toByteArray())
+ }
+
+ val result = ByteArray(buffer.position())
+ buffer.rewind()
+ buffer.get(result)
+ return result
+
+ } catch (e: Exception) {
+ return null
+ }
+ }
+
+ fun decode(data: ByteArray): BitchatPacket? {
+ try {
+ if (data.size < HEADER_SIZE + SENDER_ID_SIZE) return null
+
+ val buffer = ByteBuffer.wrap(data).apply { order(ByteOrder.BIG_ENDIAN) }
+
+ // Header
+ val version = buffer.get().toUByte()
+ if (version != 1u.toUByte()) return null
+
+ val type = buffer.get().toUByte()
+ val ttl = buffer.get().toUByte()
+
+ // Timestamp
+ val timestamp = buffer.getLong().toULong()
+
+ // Flags
+ val flags = buffer.get().toUByte()
+ val hasRecipient = (flags and Flags.HAS_RECIPIENT) != 0u.toUByte()
+ val hasSignature = (flags and Flags.HAS_SIGNATURE) != 0u.toUByte()
+ val isCompressed = (flags and Flags.IS_COMPRESSED) != 0u.toUByte()
+
+ // Payload length
+ val payloadLength = buffer.getShort().toUShort()
+
+ // Calculate expected total size
+ var expectedSize = HEADER_SIZE + SENDER_ID_SIZE + payloadLength.toInt()
+ if (hasRecipient) expectedSize += RECIPIENT_ID_SIZE
+ if (hasSignature) expectedSize += SIGNATURE_SIZE
+
+ if (data.size < expectedSize) return null
+
+ // SenderID
+ val senderID = ByteArray(SENDER_ID_SIZE)
+ buffer.get(senderID)
+
+ // RecipientID
+ val recipientID = if (hasRecipient) {
+ val recipientBytes = ByteArray(RECIPIENT_ID_SIZE)
+ buffer.get(recipientBytes)
+ recipientBytes
+ } else null
+
+ // Payload
+ val payload = if (isCompressed) {
+ // First 2 bytes are original size
+ if (payloadLength.toInt() < 2) return null
+ val originalSize = buffer.getShort().toInt()
+
+ // Compressed payload
+ val compressedPayload = ByteArray(payloadLength.toInt() - 2)
+ buffer.get(compressedPayload)
+
+ // Decompress
+ CompressionUtil.decompress(compressedPayload, originalSize) ?: return null
+ } else {
+ val payloadBytes = ByteArray(payloadLength.toInt())
+ buffer.get(payloadBytes)
+ payloadBytes
+ }
+
+ // Signature
+ val signature = if (hasSignature) {
+ val signatureBytes = ByteArray(SIGNATURE_SIZE)
+ buffer.get(signatureBytes)
+ signatureBytes
+ } else null
+
+ return BitchatPacket(
+ version = version,
+ type = type,
+ senderID = senderID,
+ recipientID = recipientID,
+ timestamp = timestamp,
+ payload = payload,
+ signature = signature,
+ ttl = ttl
+ )
+
+ } catch (e: Exception) {
+ return null
+ }
+ }
+}
+
+/**
+ * Compression utilities - temporarily disabled for initial build
+ */
+object CompressionUtil {
+ private const val COMPRESSION_THRESHOLD = 100 // bytes
+
+ fun shouldCompress(data: ByteArray): Boolean {
+ // Temporarily disabled compression
+ return false
+ }
+
+ fun compress(data: ByteArray): ByteArray? {
+ // Temporarily disabled compression
+ return null
+ }
+
+ fun decompress(compressedData: ByteArray, originalSize: Int): ByteArray? {
+ // Temporarily disabled compression
+ return null
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
new file mode 100644
index 00000000..aed55fc8
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
@@ -0,0 +1,1240 @@
+package com.bitchat.android.ui
+
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.animation.*
+import androidx.compose.animation.core.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.zIndex
+import com.bitchat.android.R
+import com.bitchat.android.model.BitchatMessage
+import com.bitchat.android.model.DeliveryStatus
+import com.bitchat.android.mesh.BluetoothMeshService
+import java.text.SimpleDateFormat
+import java.util.*
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.core.view.WindowInsetsCompat
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.clickable
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ChatScreen(viewModel: ChatViewModel) {
+ val colorScheme = MaterialTheme.colorScheme
+ val messages by viewModel.messages.observeAsState(emptyList())
+ val connectedPeers by viewModel.connectedPeers.observeAsState(emptyList())
+ val nickname by viewModel.nickname.observeAsState("")
+ val selectedPrivatePeer by viewModel.selectedPrivateChatPeer.observeAsState()
+ val currentChannel by viewModel.currentChannel.observeAsState()
+ val joinedChannels by viewModel.joinedChannels.observeAsState(emptySet())
+ val hasUnreadChannels by viewModel.unreadChannelMessages.observeAsState(emptyMap())
+ val hasUnreadPrivateMessages by viewModel.unreadPrivateMessages.observeAsState(emptySet())
+ val privateChats by viewModel.privateChats.observeAsState(emptyMap())
+ val channelMessages by viewModel.channelMessages.observeAsState(emptyMap())
+ var showSidebar by remember { mutableStateOf(false) }
+ val showCommandSuggestions by viewModel.showCommandSuggestions.observeAsState(false)
+ val commandSuggestions by viewModel.commandSuggestions.observeAsState(emptyList())
+
+ var messageText by remember { mutableStateOf("") }
+ var showPasswordPrompt by remember { mutableStateOf(false) }
+ var showPasswordDialog by remember { mutableStateOf(false) }
+ var passwordInput by remember { mutableStateOf("") }
+ var showAppInfo by remember { mutableStateOf(false) }
+ var tripleClickCount by remember { mutableStateOf(0) }
+
+ // Show password dialog when needed
+ LaunchedEffect(showPasswordPrompt) {
+ showPasswordDialog = showPasswordPrompt
+ }
+
+ val isConnected by viewModel.isConnected.observeAsState(false)
+ val unreadPrivateMessages by viewModel.unreadPrivateMessages.observeAsState(emptySet())
+ val unreadChannelMessages by viewModel.unreadChannelMessages.observeAsState(emptyMap())
+ val passwordPromptChannel by viewModel.passwordPromptChannel.observeAsState(null)
+
+ // Determine what messages to show
+ val displayMessages = when {
+ selectedPrivatePeer != null -> privateChats[selectedPrivatePeer] ?: emptyList()
+ currentChannel != null -> channelMessages[currentChannel] ?: emptyList()
+ else -> messages
+ }
+
+ // Use WindowInsets to handle keyboard properly
+ BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
+ val headerHeight = 36.dp
+
+ // Main content area that responds to keyboard/window insets
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .background(colorScheme.background)
+ .windowInsetsPadding(WindowInsets.ime) // This handles keyboard insets
+ ) {
+ // Header spacer - creates space for the floating header
+ Spacer(modifier = Modifier.height(headerHeight))
+
+ // Messages area - takes up available space, will compress when keyboard appears
+ Box(modifier = Modifier.weight(1f)) {
+ MessagesList(
+ messages = displayMessages,
+ currentUserNickname = nickname,
+ meshService = viewModel.meshService,
+ modifier = Modifier.fillMaxSize()
+ )
+ }
+
+ // Input area - stays at bottom
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = colorScheme.background,
+ shadowElevation = 8.dp
+ ) {
+ Column {
+ Divider(color = colorScheme.outline.copy(alpha = 0.3f))
+
+ // Command suggestions box
+ if (showCommandSuggestions && commandSuggestions.isNotEmpty()) {
+ CommandSuggestionsBox(
+ suggestions = commandSuggestions,
+ onSuggestionClick = { suggestion ->
+ messageText = viewModel.selectCommandSuggestion(suggestion)
+ },
+ modifier = Modifier.fillMaxWidth()
+ )
+
+ Divider(color = colorScheme.outline.copy(alpha = 0.2f))
+ }
+
+ MessageInput(
+ value = messageText,
+ onValueChange = { newText ->
+ messageText = newText
+ viewModel.updateCommandSuggestions(newText)
+ },
+ onSend = {
+ if (messageText.trim().isNotEmpty()) {
+ viewModel.sendMessage(messageText.trim())
+ messageText = ""
+ }
+ },
+ selectedPrivatePeer = selectedPrivatePeer,
+ currentChannel = currentChannel,
+ nickname = nickname,
+ modifier = Modifier.fillMaxWidth()
+ )
+ }
+ }
+ }
+
+ // Floating header - positioned absolutely at top, ignores keyboard
+ Surface(
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(headerHeight)
+ .align(Alignment.TopCenter)
+ .zIndex(1f)
+ .windowInsetsPadding(WindowInsets.statusBars), // Only respond to status bar
+ color = colorScheme.background.copy(alpha = 0.95f),
+ shadowElevation = 4.dp
+ ) {
+ TopAppBar(
+ title = {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ when {
+ selectedPrivatePeer != null -> {
+ // Private chat header
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ IconButton(
+ onClick = { viewModel.endPrivateChat() }
+ ) {
+ Text(
+ text = "← back",
+ style = MaterialTheme.typography.bodyMedium,
+ color = colorScheme.primary
+ )
+ }
+
+ Spacer(modifier = Modifier.weight(1f))
+
+ val peerNickname = viewModel.meshService.getPeerNicknames()[selectedPrivatePeer] ?: selectedPrivatePeer ?: "Unknown"
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text("🔒", fontSize = 16.sp) // Slightly larger
+ Spacer(modifier = Modifier.width(4.dp))
+ Text(
+ text = peerNickname,
+ style = MaterialTheme.typography.titleMedium,
+ color = Color(0xFFFF8C00) // Orange
+ )
+ }
+
+ Spacer(modifier = Modifier.weight(1f))
+
+ // Favorite button
+ IconButton(
+ onClick = {
+ selectedPrivatePeer?.let { peer ->
+ viewModel.toggleFavorite(peer)
+ }
+ }
+ ) {
+ val peer = selectedPrivatePeer
+ Text(
+ text = if (peer != null && viewModel.isFavorite(peer)) "★" else "☆",
+ color = if (peer != null && viewModel.isFavorite(peer)) Color.Yellow else colorScheme.primary,
+ fontSize = 18.sp // Larger icon
+ )
+ }
+ }
+ }
+ currentChannel != null -> {
+ // Channel header
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ IconButton(
+ onClick = { viewModel.switchToChannel(null) }
+ ) {
+ Text(
+ text = "← back",
+ style = MaterialTheme.typography.bodyMedium,
+ color = colorScheme.primary
+ )
+ }
+
+ Spacer(modifier = Modifier.weight(1f))
+
+ Text(
+ text = "channel: $currentChannel",
+ style = MaterialTheme.typography.titleMedium,
+ color = Color(0xFF0080FF), // Blue
+ modifier = Modifier.clickable { showSidebar = true }
+ )
+
+ Spacer(modifier = Modifier.weight(1f))
+
+ TextButton(
+ onClick = {
+ currentChannel?.let { channel ->
+ viewModel.leaveChannel(channel)
+ }
+ }
+ ) {
+ Text(
+ text = "leave",
+ style = MaterialTheme.typography.bodySmall,
+ color = Color.Red
+ )
+ }
+ }
+ }
+ else -> {
+ // Main header
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ text = "bitchat*",
+ style = MaterialTheme.typography.headlineSmall,
+ color = colorScheme.primary,
+ modifier = Modifier.clickable {
+ tripleClickCount++
+ if (tripleClickCount >= 3) {
+ tripleClickCount = 0
+ viewModel.panicClearAllData()
+ } else {
+ showAppInfo = true
+ }
+ }
+ )
+
+ Spacer(modifier = Modifier.width(8.dp))
+
+ NicknameEditor(
+ value = nickname,
+ onValueChange = viewModel::setNickname
+ )
+ }
+
+ PeerCounter(
+ connectedPeers = connectedPeers.filter { it != viewModel.meshService.myPeerID },
+ joinedChannels = joinedChannels,
+ hasUnreadChannels = hasUnreadChannels,
+ hasUnreadPrivateMessages = hasUnreadPrivateMessages,
+ isConnected = isConnected,
+ onClick = { showSidebar = true }
+ )
+ }
+ }
+ }
+ }
+ },
+ colors = TopAppBarDefaults.topAppBarColors(
+ containerColor = Color.Transparent
+ )
+ )
+ }
+
+ // Divider under header
+ Divider(
+ color = colorScheme.outline.copy(alpha = 0.3f),
+ modifier = Modifier
+ .fillMaxWidth()
+ .offset(y = headerHeight)
+ .zIndex(1f)
+ )
+
+ // Sidebar overlay
+ AnimatedVisibility(
+ visible = showSidebar,
+ enter = slideInHorizontally(
+ initialOffsetX = { it },
+ animationSpec = tween(300, easing = EaseOutCubic)
+ ) + fadeIn(animationSpec = tween(300)),
+ exit = slideOutHorizontally(
+ targetOffsetX = { it },
+ animationSpec = tween(250, easing = EaseInCubic)
+ ) + fadeOut(animationSpec = tween(250)),
+ modifier = Modifier.zIndex(2f)
+ ) {
+ SidebarOverlay(
+ viewModel = viewModel,
+ onDismiss = { showSidebar = false },
+ modifier = Modifier.fillMaxSize()
+ )
+ }
+ }
+
+ // Password dialog
+ if (showPasswordDialog && passwordPromptChannel != null) {
+ AlertDialog(
+ onDismissRequest = {
+ showPasswordDialog = false
+ passwordInput = ""
+ },
+ title = {
+ Text(
+ text = "Enter Channel Password",
+ style = MaterialTheme.typography.titleMedium,
+ color = colorScheme.onSurface
+ )
+ },
+ text = {
+ Column {
+ Text(
+ text = "Channel $passwordPromptChannel is password protected. Enter the password to join.",
+ style = MaterialTheme.typography.bodyMedium,
+ color = colorScheme.onSurface
+ )
+ Spacer(modifier = Modifier.height(8.dp))
+
+ OutlinedTextField(
+ value = passwordInput,
+ onValueChange = { passwordInput = it },
+ label = { Text("Password", style = MaterialTheme.typography.bodyMedium) },
+ textStyle = MaterialTheme.typography.bodyMedium.copy(
+ fontFamily = FontFamily.Monospace
+ ),
+ colors = OutlinedTextFieldDefaults.colors(
+ focusedBorderColor = colorScheme.primary,
+ unfocusedBorderColor = colorScheme.outline
+ )
+ )
+ }
+ },
+ confirmButton = {
+ TextButton(
+ onClick = {
+ if (passwordInput.isNotEmpty()) {
+ val success = viewModel.joinChannel(passwordPromptChannel!!, passwordInput)
+ if (success) {
+ showPasswordDialog = false
+ passwordInput = ""
+ }
+ }
+ }
+ ) {
+ Text(
+ text = "Join",
+ style = MaterialTheme.typography.bodyMedium,
+ color = colorScheme.primary
+ )
+ }
+ },
+ dismissButton = {
+ TextButton(
+ onClick = {
+ showPasswordDialog = false
+ passwordInput = ""
+ }
+ ) {
+ Text(
+ text = "Cancel",
+ style = MaterialTheme.typography.bodyMedium,
+ color = colorScheme.onSurface
+ )
+ }
+ },
+ containerColor = colorScheme.surface,
+ tonalElevation = 8.dp
+ )
+ }
+}
+
+@Composable
+private fun NicknameEditor(
+ value: String,
+ onValueChange: (String) -> Unit
+) {
+ val colorScheme = MaterialTheme.colorScheme
+ val focusManager = LocalFocusManager.current
+
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ text = "@",
+ style = MaterialTheme.typography.bodyMedium,
+ color = colorScheme.primary.copy(alpha = 0.8f)
+ )
+
+ BasicTextField(
+ value = value,
+ onValueChange = onValueChange,
+ textStyle = MaterialTheme.typography.bodyMedium.copy(
+ color = colorScheme.primary,
+ fontFamily = FontFamily.Monospace
+ ),
+ cursorBrush = SolidColor(colorScheme.primary),
+ keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+ keyboardActions = KeyboardActions(
+ onDone = {
+ focusManager.clearFocus()
+ }
+ ),
+ modifier = Modifier.widthIn(max = 100.dp)
+ )
+ }
+}
+
+@Composable
+private fun PeerCounter(
+ connectedPeers: List,
+ joinedChannels: Set,
+ hasUnreadChannels: Map,
+ hasUnreadPrivateMessages: Set,
+ isConnected: Boolean,
+ onClick: () -> Unit
+) {
+ val colorScheme = MaterialTheme.colorScheme
+
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier.clickable { onClick() }
+ ) {
+ if (hasUnreadChannels.values.any { it > 0 }) {
+ Text(
+ text = "#",
+ style = MaterialTheme.typography.bodyMedium,
+ color = Color(0xFF0080FF),
+ fontSize = 16.sp
+ )
+ Spacer(modifier = Modifier.width(6.dp))
+ }
+
+ if (hasUnreadPrivateMessages.isNotEmpty()) {
+ Text(
+ text = "✉",
+ style = MaterialTheme.typography.bodyMedium,
+ color = Color(0xFFFF8C00),
+ fontSize = 16.sp
+ )
+ Spacer(modifier = Modifier.width(6.dp))
+ }
+
+ Icon(
+ imageVector = Icons.Default.Person,
+ contentDescription = "Connected peers",
+ modifier = Modifier.size(16.dp),
+ tint = if (isConnected) Color(0xFF00C851) else Color.Red
+ )
+ Spacer(modifier = Modifier.width(4.dp))
+ Text(
+ text = "${connectedPeers.size}",
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isConnected) Color(0xFF00C851) else Color.Red,
+ fontSize = 16.sp,
+ fontWeight = FontWeight.Medium
+ )
+
+ if (joinedChannels.isNotEmpty()) {
+ Text(
+ text = " · ⧉ ${joinedChannels.size}",
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isConnected) Color(0xFF00C851) else Color.Red,
+ fontSize = 16.sp,
+ fontWeight = FontWeight.Medium
+ )
+ }
+ }
+}
+
+@Composable
+private fun MessagesList(
+ messages: List,
+ currentUserNickname: String,
+ meshService: BluetoothMeshService,
+ modifier: Modifier = Modifier
+) {
+ val listState = rememberLazyListState()
+ val colorScheme = MaterialTheme.colorScheme
+
+ // Auto-scroll to bottom when new messages arrive
+ LaunchedEffect(messages.size) {
+ if (messages.isNotEmpty()) {
+ listState.animateScrollToItem(messages.size - 1)
+ }
+ }
+
+ LazyColumn(
+ state = listState,
+ modifier = modifier.padding(horizontal = 12.dp, vertical = 8.dp),
+ verticalArrangement = Arrangement.spacedBy(2.dp)
+ ) {
+ items(messages) { message ->
+ MessageItem(
+ message = message,
+ currentUserNickname = currentUserNickname,
+ meshService = meshService
+ )
+ }
+ }
+}
+
+@Composable
+private fun MessageItem(
+ message: BitchatMessage,
+ currentUserNickname: String,
+ meshService: BluetoothMeshService
+) {
+ val colorScheme = MaterialTheme.colorScheme
+
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.Top
+ ) {
+ // Single text view for natural wrapping (like iOS)
+ Text(
+ text = formatMessageAsAnnotatedString(message, currentUserNickname, meshService, colorScheme),
+ modifier = Modifier.weight(1f),
+ fontFamily = FontFamily.Monospace,
+ softWrap = true,
+ overflow = TextOverflow.Visible
+ )
+
+ // Delivery status for private messages
+ if (message.isPrivate && message.sender == currentUserNickname) {
+ message.deliveryStatus?.let { status ->
+ DeliveryStatusIcon(status = status)
+ }
+ }
+ }
+}
+
+@Composable
+private fun formatMessageAsAnnotatedString(
+ message: BitchatMessage,
+ currentUserNickname: String,
+ meshService: BluetoothMeshService,
+ colorScheme: ColorScheme
+): androidx.compose.ui.text.AnnotatedString {
+ val timeFormatter = remember { SimpleDateFormat("HH:mm:ss", Locale.getDefault()) }
+ val builder = androidx.compose.ui.text.AnnotatedString.Builder()
+
+ // Timestamp
+ val timestampColor = if (message.sender == "system") Color.Gray else colorScheme.primary.copy(alpha = 0.7f)
+ builder.pushStyle(androidx.compose.ui.text.SpanStyle(
+ color = timestampColor,
+ fontSize = 12.sp
+ ))
+ builder.append("[${timeFormatter.format(message.timestamp)}] ")
+ builder.pop()
+
+ if (message.sender != "system") {
+ // Sender
+ val senderColor = when {
+ message.sender == currentUserNickname -> colorScheme.primary
+ else -> {
+ val peerID = message.senderPeerID
+ val rssi = peerID?.let { meshService.getPeerRSSI()[it] } ?: -60
+ getRSSIColor(rssi)
+ }
+ }
+
+ builder.pushStyle(androidx.compose.ui.text.SpanStyle(
+ color = senderColor,
+ fontSize = 14.sp,
+ fontWeight = FontWeight.Medium
+ ))
+ builder.append("<@${message.sender}> ")
+ builder.pop()
+
+ // Message content with mentions and hashtags highlighted
+ appendFormattedContent(builder, message.content, message.mentions, currentUserNickname, colorScheme)
+
+ } else {
+ // System message
+ builder.pushStyle(androidx.compose.ui.text.SpanStyle(
+ color = Color.Gray,
+ fontSize = 12.sp,
+ fontStyle = androidx.compose.ui.text.font.FontStyle.Italic
+ ))
+ builder.append("* ${message.content} *")
+ builder.pop()
+ }
+
+ return builder.toAnnotatedString()
+}
+
+private fun appendFormattedContent(
+ builder: androidx.compose.ui.text.AnnotatedString.Builder,
+ content: String,
+ mentions: List?,
+ currentUserNickname: String,
+ colorScheme: ColorScheme
+) {
+ val isMentioned = mentions?.contains(currentUserNickname) == true
+
+ // Parse hashtags and mentions
+ val hashtagPattern = "#([a-zA-Z0-9_]+)".toRegex()
+ val mentionPattern = "@([a-zA-Z0-9_]+)".toRegex()
+
+ val hashtagMatches = hashtagPattern.findAll(content).toList()
+ val mentionMatches = mentionPattern.findAll(content).toList()
+
+ // Combine and sort all matches
+ val allMatches = (hashtagMatches.map { it.range to "hashtag" } +
+ mentionMatches.map { it.range to "mention" })
+ .sortedBy { it.first.first }
+
+ var lastEnd = 0
+
+ for ((range, type) in allMatches) {
+ // Add text before the match
+ if (lastEnd < range.first) {
+ val beforeText = content.substring(lastEnd, range.first)
+ builder.pushStyle(androidx.compose.ui.text.SpanStyle(
+ color = colorScheme.primary,
+ fontSize = 14.sp,
+ fontWeight = if (isMentioned) FontWeight.Bold else FontWeight.Normal
+ ))
+ builder.append(beforeText)
+ builder.pop()
+ }
+
+ // Add the styled match
+ val matchText = content.substring(range.first, range.last + 1)
+ when (type) {
+ "hashtag" -> {
+ builder.pushStyle(androidx.compose.ui.text.SpanStyle(
+ color = Color(0xFF0080FF), // Blue
+ fontSize = 14.sp,
+ fontWeight = FontWeight.SemiBold,
+ textDecoration = androidx.compose.ui.text.style.TextDecoration.Underline
+ ))
+ }
+ "mention" -> {
+ builder.pushStyle(androidx.compose.ui.text.SpanStyle(
+ color = Color(0xFFFF8C00), // Orange
+ fontSize = 14.sp,
+ fontWeight = FontWeight.SemiBold
+ ))
+ }
+ }
+ builder.append(matchText)
+ builder.pop()
+
+ lastEnd = range.last + 1
+ }
+
+ // Add remaining text
+ if (lastEnd < content.length) {
+ val remainingText = content.substring(lastEnd)
+ builder.pushStyle(androidx.compose.ui.text.SpanStyle(
+ color = colorScheme.primary,
+ fontSize = 14.sp,
+ fontWeight = if (isMentioned) FontWeight.Bold else FontWeight.Normal
+ ))
+ builder.append(remainingText)
+ builder.pop()
+ }
+}
+
+@Composable
+private fun DeliveryStatusIcon(status: DeliveryStatus) {
+ val colorScheme = MaterialTheme.colorScheme
+
+ when (status) {
+ is DeliveryStatus.Sending -> {
+ Text(
+ text = "○",
+ fontSize = 10.sp,
+ color = colorScheme.primary.copy(alpha = 0.6f)
+ )
+ }
+ is DeliveryStatus.Sent -> {
+ Text(
+ text = "✓",
+ fontSize = 10.sp,
+ color = colorScheme.primary.copy(alpha = 0.6f)
+ )
+ }
+ is DeliveryStatus.Delivered -> {
+ Text(
+ text = "✓✓",
+ fontSize = 10.sp,
+ color = colorScheme.primary.copy(alpha = 0.8f)
+ )
+ }
+ is DeliveryStatus.Read -> {
+ Text(
+ text = "✓✓",
+ fontSize = 10.sp,
+ color = Color(0xFF007AFF), // Blue
+ fontWeight = FontWeight.Bold
+ )
+ }
+ is DeliveryStatus.Failed -> {
+ Text(
+ text = "⚠",
+ fontSize = 10.sp,
+ color = Color.Red.copy(alpha = 0.8f)
+ )
+ }
+ is DeliveryStatus.PartiallyDelivered -> {
+ Text(
+ text = "✓${status.reached}/${status.total}",
+ fontSize = 10.sp,
+ color = colorScheme.primary.copy(alpha = 0.6f)
+ )
+ }
+ }
+}
+
+@Composable
+private fun MessageInput(
+ value: String,
+ onValueChange: (String) -> Unit,
+ onSend: () -> Unit,
+ selectedPrivatePeer: String?,
+ currentChannel: String?,
+ nickname: String,
+ modifier: Modifier = Modifier
+) {
+ val colorScheme = MaterialTheme.colorScheme
+
+ Row(
+ modifier = modifier.padding(horizontal = 12.dp, vertical = 8.dp), // Reduced padding
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ // Prompt
+ Text(
+ text = when {
+ selectedPrivatePeer != null -> "<@$nickname> →"
+ currentChannel != null -> "<@$nickname> →" // Could show if channel is encrypted
+ else -> "<@$nickname>"
+ },
+ style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Medium),
+ color = when {
+ selectedPrivatePeer != null -> Color(0xFFFF8C00) // Orange for private
+ currentChannel != null -> Color(0xFFFF8C00) // Orange if encrypted channel
+ else -> colorScheme.primary
+ },
+ fontFamily = FontFamily.Monospace
+ )
+
+ Spacer(modifier = Modifier.width(8.dp))
+
+ // Text input
+ BasicTextField(
+ value = value,
+ onValueChange = onValueChange,
+ textStyle = MaterialTheme.typography.bodyMedium.copy(
+ color = colorScheme.primary,
+ fontFamily = FontFamily.Monospace
+ ),
+ cursorBrush = SolidColor(colorScheme.primary),
+ keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),
+ keyboardActions = KeyboardActions(onSend = { onSend() }),
+ modifier = Modifier.weight(1f)
+ )
+
+ Spacer(modifier = Modifier.width(8.dp)) // Reduced spacing
+
+ // Send button - smaller with light green background
+ IconButton(
+ onClick = onSend,
+ modifier = Modifier.size(32.dp) // Reduced from 40dp
+ ) {
+ Box(
+ modifier = Modifier
+ .size(32.dp) // Reduced size
+ .background(
+ color = Color(0xFF00C851).copy(alpha = 0.15f), // Light green background
+ shape = CircleShape
+ ),
+ contentAlignment = Alignment.Center
+ ) {
+ Text(
+ text = "↑",
+ style = MaterialTheme.typography.titleMedium.copy(fontSize = 16.sp), // Smaller arrow
+ color = Color(0xFF00C851) // Green arrow
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun SidebarOverlay(
+ viewModel: ChatViewModel,
+ onDismiss: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ val colorScheme = MaterialTheme.colorScheme
+ val connectedPeers by viewModel.connectedPeers.observeAsState(emptyList())
+ val joinedChannels by viewModel.joinedChannels.observeAsState(emptyList())
+ val currentChannel by viewModel.currentChannel.observeAsState()
+ val selectedPrivatePeer by viewModel.selectedPrivateChatPeer.observeAsState()
+ val nickname by viewModel.nickname.observeAsState("")
+
+ // Get peer data from mesh service
+ val peerNicknames = viewModel.meshService.getPeerNicknames()
+ val peerRSSI = viewModel.meshService.getPeerRSSI()
+ val myPeerID = viewModel.meshService.myPeerID
+
+ Box(
+ modifier = modifier
+ .background(Color.Black.copy(alpha = 0.5f))
+ .clickable { onDismiss() }
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxHeight()
+ .width(280.dp)
+ .align(Alignment.CenterEnd)
+ .clickable { /* Prevent dismissing when clicking sidebar */ }
+ ) {
+ // Grey vertical bar for visual continuity (matches iOS)
+ Box(
+ modifier = Modifier
+ .fillMaxHeight()
+ .width(1.dp)
+ .background(Color.Gray.copy(alpha = 0.3f))
+ )
+
+ Column(
+ modifier = Modifier
+ .fillMaxHeight()
+ .weight(1f)
+ .background(colorScheme.surface)
+ .windowInsetsPadding(WindowInsets.statusBars) // Add status bar padding
+ ) {
+ // Header - match main toolbar height (matches iOS)
+ Row(
+ modifier = Modifier
+ .height(36.dp) // Match reduced main header height
+ .fillMaxWidth()
+ .background(colorScheme.surface.copy(alpha = 0.95f))
+ .padding(horizontal = 12.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = "YOUR NETWORK",
+ style = MaterialTheme.typography.titleMedium.copy(
+ fontWeight = FontWeight.Bold,
+ fontFamily = FontFamily.Monospace
+ ),
+ color = colorScheme.onSurface
+ )
+ Spacer(modifier = Modifier.weight(1f))
+ }
+
+ Divider()
+
+ // Scrollable content
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(vertical = 8.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ // Channels section
+ if (joinedChannels.isNotEmpty()) {
+ item {
+ ChannelsSection(
+ channels = joinedChannels.toList(), // Convert Set to List
+ currentChannel = currentChannel,
+ colorScheme = colorScheme,
+ onChannelClick = { channel ->
+ viewModel.switchToChannel(channel)
+ onDismiss()
+ },
+ onLeaveChannel = { channel ->
+ viewModel.leaveChannel(channel)
+ }
+ )
+ }
+
+ item {
+ Divider(
+ modifier = Modifier.padding(vertical = 4.dp)
+ )
+ }
+ }
+
+ // People section
+ item {
+ PeopleSection(
+ connectedPeers = connectedPeers,
+ peerNicknames = peerNicknames,
+ peerRSSI = peerRSSI,
+ nickname = nickname,
+ colorScheme = colorScheme,
+ selectedPrivatePeer = selectedPrivatePeer,
+ viewModel = viewModel,
+ onPrivateChatStart = { peerID ->
+ viewModel.startPrivateChat(peerID)
+ onDismiss()
+ }
+ )
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun ChannelsSection(
+ channels: List,
+ currentChannel: String?,
+ colorScheme: ColorScheme,
+ onChannelClick: (String) -> Unit,
+ onLeaveChannel: (String) -> Unit
+) {
+ Column {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 8.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = Icons.Default.Person, // Using Person icon as placeholder
+ contentDescription = null,
+ modifier = Modifier.size(10.dp),
+ tint = colorScheme.onSurface.copy(alpha = 0.6f)
+ )
+ Spacer(modifier = Modifier.width(6.dp))
+ Text(
+ text = "CHANNELS",
+ style = MaterialTheme.typography.labelSmall,
+ color = colorScheme.onSurface.copy(alpha = 0.6f),
+ fontWeight = FontWeight.Bold
+ )
+ }
+
+ channels.forEach { channel ->
+ val isSelected = channel == currentChannel
+
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable { onChannelClick(channel) }
+ .background(
+ if (isSelected) colorScheme.primaryContainer.copy(alpha = 0.3f)
+ else Color.Transparent
+ )
+ .padding(horizontal = 24.dp, vertical = 8.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = "#$channel",
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isSelected) colorScheme.primary else colorScheme.onSurface,
+ fontWeight = if (isSelected) FontWeight.Medium else FontWeight.Normal,
+ modifier = Modifier.weight(1f)
+ )
+
+ // Leave channel button
+ IconButton(
+ onClick = { onLeaveChannel(channel) },
+ modifier = Modifier.size(24.dp)
+ ) {
+ Icon(
+ imageVector = Icons.Default.Close,
+ contentDescription = "Leave channel",
+ modifier = Modifier.size(14.dp),
+ tint = colorScheme.onSurface.copy(alpha = 0.5f)
+ )
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun PeopleSection(
+ connectedPeers: List,
+ peerNicknames: Map,
+ peerRSSI: Map,
+ nickname: String,
+ colorScheme: ColorScheme,
+ selectedPrivatePeer: String?,
+ viewModel: ChatViewModel,
+ onPrivateChatStart: (String) -> Unit
+) {
+ Column {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 8.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = Icons.Default.Person, // Using Person icon for people
+ contentDescription = null,
+ modifier = Modifier.size(10.dp),
+ tint = colorScheme.onSurface.copy(alpha = 0.6f)
+ )
+ Spacer(modifier = Modifier.width(6.dp))
+ Text(
+ text = "PEOPLE",
+ style = MaterialTheme.typography.labelSmall,
+ color = colorScheme.onSurface.copy(alpha = 0.6f),
+ fontWeight = FontWeight.Bold
+ )
+ }
+
+ if (connectedPeers.isEmpty()) {
+ Text(
+ text = "No one connected",
+ style = MaterialTheme.typography.bodyMedium,
+ color = colorScheme.onSurface.copy(alpha = 0.5f),
+ modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)
+ )
+ } else {
+ // Sort peers: favorites first, then by nickname
+ val sortedPeers = connectedPeers.sortedWith { peer1, peer2 ->
+ val isFav1 = viewModel.isFavorite(peer1)
+ val isFav2 = viewModel.isFavorite(peer2)
+
+ when {
+ isFav1 && !isFav2 -> -1
+ !isFav1 && isFav2 -> 1
+ else -> {
+ val name1 = if (peer1 == nickname) "You" else (peerNicknames[peer1] ?: peer1)
+ val name2 = if (peer2 == nickname) "You" else (peerNicknames[peer2] ?: peer2)
+ name1.compareTo(name2, ignoreCase = true)
+ }
+ }
+ }
+
+ sortedPeers.forEach { peerID ->
+ val isSelected = peerID == selectedPrivatePeer
+ val isFavorite = viewModel.isFavorite(peerID)
+ val displayName = if (peerID == nickname) "You" else (peerNicknames[peerID] ?: peerID)
+ val signalStrength = peerRSSI[peerID] ?: 0
+
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable { onPrivateChatStart(peerID) }
+ .background(
+ if (isSelected) colorScheme.primaryContainer.copy(alpha = 0.3f)
+ else Color.Transparent
+ )
+ .padding(horizontal = 24.dp, vertical = 8.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ // Signal strength indicators
+ Row(modifier = Modifier.width(24.dp)) {
+ repeat(3) { index ->
+ val opacity = when {
+ signalStrength >= (index + 1) * 33 -> 1f
+ else -> 0.2f
+ }
+ Box(
+ modifier = Modifier
+ .size(width = 3.dp, height = (4 + index * 2).dp)
+ .background(
+ colorScheme.onSurface.copy(alpha = opacity),
+ RoundedCornerShape(1.dp)
+ )
+ )
+ if (index < 2) Spacer(modifier = Modifier.width(2.dp))
+ }
+ }
+
+ Spacer(modifier = Modifier.width(8.dp))
+
+ Text(
+ text = displayName,
+ style = MaterialTheme.typography.bodyMedium,
+ color = if (isSelected) colorScheme.primary else colorScheme.onSurface,
+ fontWeight = if (isSelected) FontWeight.Medium else FontWeight.Normal,
+ modifier = Modifier.weight(1f)
+ )
+
+ // Favorite star
+ IconButton(
+ onClick = { viewModel.toggleFavorite(peerID) },
+ modifier = Modifier.size(24.dp)
+ ) {
+ Icon(
+ imageVector = Icons.Default.Star,
+ contentDescription = if (isFavorite) "Remove from favorites" else "Add to favorites",
+ modifier = Modifier.size(16.dp),
+ tint = if (isFavorite) colorScheme.primary else colorScheme.onSurface.copy(alpha = 0.3f)
+ )
+ }
+ }
+ }
+ }
+ }
+}
+
+private fun getRSSIColor(rssi: Int): Color {
+ return when {
+ rssi >= -50 -> Color(0xFF00FF00) // Bright green
+ rssi >= -60 -> Color(0xFF80FF00) // Green-yellow
+ rssi >= -70 -> Color(0xFFFFFF00) // Yellow
+ rssi >= -80 -> Color(0xFFFF8000) // Orange
+ else -> Color(0xFFFF4444) // Red
+ }
+}
+
+@Composable
+private fun CommandSuggestionsBox(
+ suggestions: List,
+ onSuggestionClick: (ChatViewModel.CommandSuggestion) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ val colorScheme = MaterialTheme.colorScheme
+
+ Column(
+ modifier = modifier
+ .background(colorScheme.surface)
+ .border(1.dp, colorScheme.outline.copy(alpha = 0.3f), RoundedCornerShape(4.dp))
+ .padding(vertical = 8.dp)
+ ) {
+ suggestions.forEach { suggestion ->
+ CommandSuggestionItem(
+ suggestion = suggestion,
+ onClick = { onSuggestionClick(suggestion) }
+ )
+ }
+ }
+}
+
+@Composable
+private fun CommandSuggestionItem(
+ suggestion: ChatViewModel.CommandSuggestion,
+ onClick: () -> Unit
+) {
+ val colorScheme = MaterialTheme.colorScheme
+
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable { onClick() }
+ .padding(horizontal = 12.dp, vertical = 3.dp)
+ .background(Color.Gray.copy(alpha = 0.1f)),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ // Show all aliases together
+ val allCommands = if (suggestion.aliases.isNotEmpty()) {
+ listOf(suggestion.command) + suggestion.aliases
+ } else {
+ listOf(suggestion.command)
+ }
+
+ Text(
+ text = allCommands.joinToString(", "),
+ style = MaterialTheme.typography.bodySmall.copy(
+ fontFamily = FontFamily.Monospace,
+ fontWeight = FontWeight.Medium
+ ),
+ color = colorScheme.primary,
+ fontSize = 11.sp
+ )
+
+ // Show syntax if any
+ suggestion.syntax?.let { syntax ->
+ Spacer(modifier = Modifier.width(8.dp))
+ Text(
+ text = syntax,
+ style = MaterialTheme.typography.bodySmall.copy(
+ fontFamily = FontFamily.Monospace
+ ),
+ color = colorScheme.onSurface.copy(alpha = 0.8f),
+ fontSize = 10.sp
+ )
+ }
+
+ Spacer(modifier = Modifier.weight(1f))
+
+ // Show description
+ Text(
+ text = suggestion.description,
+ style = MaterialTheme.typography.bodySmall.copy(
+ fontFamily = FontFamily.Monospace
+ ),
+ color = colorScheme.onSurface.copy(alpha = 0.7f),
+ fontSize = 10.sp,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
new file mode 100644
index 00000000..744686ad
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
@@ -0,0 +1,1267 @@
+package com.bitchat.android.ui
+
+import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Build
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.os.VibratorManager
+import android.util.Log
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.bitchat.android.mesh.BluetoothMeshDelegate
+import com.bitchat.android.mesh.BluetoothMeshService
+import com.bitchat.android.model.BitchatMessage
+import com.bitchat.android.model.DeliveryAck
+import com.bitchat.android.model.DeliveryStatus
+import com.bitchat.android.model.ReadReceipt
+import kotlinx.coroutines.launch
+import java.security.MessageDigest
+import java.util.*
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.SecretKeySpec
+import kotlin.random.Random
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.MediatorLiveData
+import kotlinx.coroutines.delay
+
+/**
+ * Main ViewModel for bitchat - 100% compatible with iOS ChatViewModel
+ */
+class ChatViewModel(application: Application) : AndroidViewModel(application), BluetoothMeshDelegate {
+
+ private val context: Context = application.applicationContext
+ private val prefs: SharedPreferences = context.getSharedPreferences("bitchat_prefs", Context.MODE_PRIVATE)
+
+ // Core services
+ val meshService = BluetoothMeshService(context)
+
+ // Observable state - exactly same as iOS version
+ private val _messages = MutableLiveData>(emptyList())
+ val messages: LiveData> = _messages
+
+ private val _connectedPeers = MutableLiveData>(emptyList())
+ val connectedPeers: LiveData> = _connectedPeers
+
+ private val _nickname = MutableLiveData()
+ val nickname: LiveData = _nickname
+
+ private val _isConnected = MutableLiveData(false)
+ val isConnected: LiveData = _isConnected
+
+ // Private chats
+ private val _privateChats = MutableLiveData