diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index a5a31ce6..2f8a7906 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -7,9 +7,10 @@ on:
branches: [ "main", "develop" ]
jobs:
- test:
+ verify:
+ name: Test & Lint
runs-on: ubuntu-latest
-
+
steps:
- name: Checkout code
uses: actions/checkout@v4
@@ -39,7 +40,10 @@ jobs:
- name: Run unit tests
run: ./gradlew testDebugUnitTest
- - name: Upload Test Reports (xml+html)
+ - name: Run lint
+ run: ./gradlew lintDebug
+
+ - name: Upload test reports
if: always()
uses: actions/upload-artifact@v4
with:
@@ -48,47 +52,6 @@ jobs:
**/build/test-results/
**/build/reports/tests/
- - name: Upload test results
- uses: actions/upload-artifact@v4
- if: always()
- with:
- name: test-results
- path: |
- **/build/test-results/
- **/build/reports/tests/
-
- lint:
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v4
-
- - name: Set up JDK 17
- uses: actions/setup-java@v4
- with:
- java-version: '17'
- distribution: 'temurin'
-
- - name: Setup Gradle
- uses: gradle/gradle-build-action@v3
-
- - name: Grant execute permission for gradlew
- run: chmod +x gradlew
-
- - name: Cache Gradle packages
- uses: actions/cache@v3
- with:
- path: |
- ~/.gradle/caches
- ~/.gradle/wrapper
- key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
- restore-keys: |
- ${{ runner.os }}-gradle-
-
- - name: Run lint
- run: ./gradlew lintDebug
-
- name: Upload lint results
uses: actions/upload-artifact@v4
if: always()
@@ -97,9 +60,13 @@ jobs:
path: '**/build/reports/lint-results-*.html'
build:
+ name: Build ${{ matrix.variant }}
runs-on: ubuntu-latest
- needs: [test, lint]
-
+ needs: verify
+ strategy:
+ matrix:
+ variant: [Debug, Release]
+
steps:
- name: Checkout code
uses: actions/checkout@v4
@@ -126,20 +93,11 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- - name: Build debug APK
- run: ./gradlew assembleDebug
+ - name: Build ${{ matrix.variant }} APK
+ run: ./gradlew assemble${{ matrix.variant }}
- - name: Build release APK
- run: ./gradlew assembleRelease
-
- - name: Upload debug APK
+ - name: Upload ${{ matrix.variant }} APK
uses: actions/upload-artifact@v4
with:
- name: debug-apk
- path: app/build/outputs/apk/debug/*.apk
-
- - name: Upload release APK
- uses: actions/upload-artifact@v4
- with:
- name: release-apk
- path: app/build/outputs/apk/release/*.apk
+ name: ${{ matrix.variant }}-apk
+ path: app/build/outputs/apk/**/*.apk
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4b3b8b7b..79495ee9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
with:
distribution: temurin
java-version: 17
-
+
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
@@ -38,30 +38,27 @@ jobs:
- name: Grant execute permission for Gradlew
run: chmod +x ./gradlew
- - name: Build APK
+ - name: Build Release APK (with Tor)
run: ./gradlew assembleRelease --no-daemon --stacktrace
-
+
- name: List APK files
run: |
echo "APK files built:"
- find app/build/outputs/apk/release -name "*.apk" -type f
+ find app/build/outputs/apk -name "*.apk" -type f
- name: Rename APK
run: |
- mv app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/bitchat.apk
-
+ mv app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/bitchat-android.apk
+
- name: DEBUG
run: |
set -x
-
pwd
-
ls -all
-
cd app/build/outputs/
ls -all
- tree
-
+ tree || ls -R
+
# Optional: Sign APK (requires secrets)
# - name: Sign APK
# uses: r0adkll/sign-android-release@v1
@@ -75,7 +72,7 @@ jobs:
- name: Upload APK as artifact
uses: actions/upload-artifact@v4
with:
- name: bitchat-release-apk-${{ github.ref_name }}
+ name: bitchat-android-apk-${{ github.ref_name }}
path: app/build/outputs/apk/release/*.apk
retention-days: 30
if-no-files-found: error
@@ -88,13 +85,22 @@ jobs:
- name: Download APK artifact
uses: actions/download-artifact@v4
with:
- name: bitchat-release-apk-${{ github.ref_name }}
- path: .
+ name: bitchat-android-apk-${{ github.ref_name }}
+ path: release
- name: Create GitHub Release
uses: softprops/action-gh-release@v2
with:
- files: bitchat.apk
+ files: |
+ release/bitchat-android.apk
name: Release ${{ github.ref_name }}
+ body: |
+ ## bitchat Android Release
+
+ **bitchat-android.apk** (~15MB)
+ - Secure P2P messaging over Bluetooth mesh and Nostr
+ - Built-in Tor support (custom Arti build with 16KB page size)
+ - Compatible with Google Play requirements (Nov 2025+)
+ - Cross-platform compatible with iOS version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 151e1b4f..64ac199e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,9 @@ dependency-reduced-pom.xml
# Other
*.log
.cxx/
-*build/
+# Gradle/Android build directories (but not tools/arti-build/)
+**/build/
+!tools/arti-build/
out/
gen/
*~
@@ -57,3 +59,7 @@ google-services.json
# Keystore files
*.jks
*.keystore
+
+# Arti build artifacts (cloned repo and Rust build cache)
+tools/arti-build/.arti-source/
+tools/arti-build/target/
diff --git a/README.md b/README.md
index 50f0cf54..c9b0091d 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,7 @@ The app requires the following permissions (automatically requested):
- **Bluetooth**: Core BLE functionality
- **Location**: Required for BLE scanning on Android
+- **Network**: Expand your mesh through public internet relays
- **Notifications**: Message alerts and background updates
### Hardware Requirements
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ca87d8dc..f6de2444 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
applicationId = "com.bitchat.droid"
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
- versionCode = 26
- versionName = "1.5.1"
+ versionCode = 27
+ versionName = "1.6.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
@@ -30,6 +30,12 @@ android {
}
buildTypes {
+ debug {
+ ndk {
+ // Include x86_64 for emulator support during development
+ abiFilters += listOf("arm64-v8a", "x86_64")
+ }
+ }
release {
isMinifyEnabled = true
isShrinkResources = true
@@ -37,6 +43,11 @@ android {
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
+ ndk {
+ // ARM64-only to minimize APK size (~5.8MB savings)
+ // Excludes x86_64 as emulator not needed for production builds
+ abiFilters += listOf("arm64-v8a")
+ }
}
}
compileOptions {
@@ -95,8 +106,11 @@ dependencies {
// WebSocket
implementation(libs.okhttp)
- // Arti (Tor in Rust) Android bridge - use published AAR with native libs
- implementation("info.guardianproject:arti-mobile-ex:1.2.3")
+ // Arti (Tor in Rust) Android bridge - custom build from latest source
+ // Built with rustls, 16KB page size support, and onio//un service client
+ // Native libraries are in src/tor/jniLibs/ (extracted from arti-custom.aar)
+ // Only included in tor flavor to reduce APK size for standard builds
+ // Note: AAR is kept in libs/ for reference, but libraries loaded from jniLibs/
// Google Play Services Location
implementation(libs.gms.location)
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f8b6946c..d3e004db 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -17,9 +17,12 @@
-keep class com.bitchat.android.nostr.** { *; }
-keep class com.bitchat.android.identity.** { *; }
-# Arti (Tor) ProGuard rules
+# Keep Tor implementation (always included)
+-keep class com.bitchat.android.net.RealTorProvider { *; }
+
+# Arti (Custom Tor implementation in Rust) ProGuard rules
-keep class info.guardianproject.arti.** { *; }
--keep class org.torproject.jni.** { *; }
--keepnames class org.torproject.jni.**
+-keep class org.torproject.arti.** { *; }
+-keepnames class org.torproject.arti.**
-dontwarn info.guardianproject.arti.**
--dontwarn org.torproject.jni.**
+-dontwarn org.torproject.arti.**
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8e953323..b228fd34 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,13 @@
+
+
+
+
+
+
+
@@ -77,5 +84,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/bitchat/android/BitchatApplication.kt b/app/src/main/java/com/bitchat/android/BitchatApplication.kt
index df9cd6e5..b120b216 100644
--- a/app/src/main/java/com/bitchat/android/BitchatApplication.kt
+++ b/app/src/main/java/com/bitchat/android/BitchatApplication.kt
@@ -3,18 +3,21 @@ package com.bitchat.android
import android.app.Application
import com.bitchat.android.nostr.RelayDirectory
import com.bitchat.android.ui.theme.ThemePreferenceManager
-import com.bitchat.android.net.TorManager
+import com.bitchat.android.net.ArtiTorManager
/**
* Main application class for bitchat Android
*/
class BitchatApplication : Application() {
-
+
override fun onCreate() {
super.onCreate()
-
+
// Initialize Tor first so any early network goes over Tor
- try { TorManager.init(this) } catch (_: Exception) { }
+ try {
+ val torProvider = ArtiTorManager.getInstance()
+ torProvider.init(this)
+ } catch (_: Exception){}
// Initialize relay directory (loads assets/nostr_relays.csv)
RelayDirectory.initialize(this)
@@ -38,6 +41,12 @@ class BitchatApplication : Application() {
// Initialize debug preference manager (persists debug toggles)
try { com.bitchat.android.ui.debug.DebugPreferenceManager.init(this) } catch (_: Exception) { }
+ // Initialize mesh service preferences
+ try { com.bitchat.android.service.MeshServicePreferences.init(this) } catch (_: Exception) { }
+
+ // Proactively start the foreground service to keep mesh alive
+ try { com.bitchat.android.service.MeshForegroundService.start(this) } catch (_: Exception) { }
+
// TorManager already initialized above
}
}
diff --git a/app/src/main/java/com/bitchat/android/MainActivity.kt b/app/src/main/java/com/bitchat/android/MainActivity.kt
index 28d67280..6e9fbd39 100644
--- a/app/src/main/java/com/bitchat/android/MainActivity.kt
+++ b/app/src/main/java/com/bitchat/android/MainActivity.kt
@@ -51,7 +51,7 @@ class MainActivity : OrientationAwareActivity() {
private lateinit var locationStatusManager: LocationStatusManager
private lateinit var batteryOptimizationManager: BatteryOptimizationManager
- // Core mesh service - managed at app level
+ // Core mesh service - provided by the foreground service holder
private lateinit var meshService: BluetoothMeshService
private val mainViewModel: MainViewModel by viewModels()
private val chatViewModel: ChatViewModel by viewModels {
@@ -66,13 +66,21 @@ class MainActivity : OrientationAwareActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ // Check if this is a quit request from the notification
+ if (intent.getBooleanExtra("ACTION_QUIT_APP", false)) {
+ android.util.Log.d("MainActivity", "Quit request received in onCreate, finishing activity")
+ finish()
+ return
+ }
+
// Enable edge-to-edge display for modern Android look
enableEdgeToEdge()
// Initialize permission management
permissionManager = PermissionManager(this)
- // Initialize core mesh service first
- meshService = BluetoothMeshService(this)
+ // Ensure foreground service is running and get mesh instance from holder
+ try { com.bitchat.android.service.MeshForegroundService.start(applicationContext) } catch (_: Exception) { }
+ meshService = com.bitchat.android.service.MeshServiceHolder.getOrCreate(applicationContext)
bluetoothStatusManager = BluetoothStatusManager(
activity = this,
context = this,
@@ -630,6 +638,15 @@ class MainActivity : OrientationAwareActivity() {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
+ setIntent(intent)
+
+ // Check if this is a quit request from the notification
+ if (intent.getBooleanExtra("ACTION_QUIT_APP", false)) {
+ android.util.Log.d("MainActivity", "Quit request received, finishing activity")
+ finish()
+ return
+ }
+
// Handle notification intents when app is already running
if (mainViewModel.onboardingState.value == OnboardingState.COMPLETE) {
handleNotificationIntent(intent)
@@ -640,6 +657,8 @@ class MainActivity : OrientationAwareActivity() {
super.onResume()
// Check Bluetooth and Location status on resume and handle accordingly
if (mainViewModel.onboardingState.value == OnboardingState.COMPLETE) {
+ // Reattach mesh delegate to new ChatViewModel instance after Activity recreation
+ try { meshService.delegate = chatViewModel } catch (_: Exception) { }
// Set app foreground state
meshService.connectionManager.setAppBackgroundState(false)
chatViewModel.setAppBackgroundState(false)
@@ -665,13 +684,15 @@ class MainActivity : OrientationAwareActivity() {
}
}
- override fun onPause() {
+ override fun onPause() {
super.onPause()
// Only set background state if app is fully initialized
if (mainViewModel.onboardingState.value == OnboardingState.COMPLETE) {
// Set app background state
meshService.connectionManager.setAppBackgroundState(true)
chatViewModel.setAppBackgroundState(true)
+ // Detach UI delegate so the foreground service can own DM notifications while UI is closed
+ try { meshService.delegate = null } catch (_: Exception) { }
}
}
@@ -746,14 +767,6 @@ class MainActivity : OrientationAwareActivity() {
Log.w("MainActivity", "Error cleaning up location status manager: ${e.message}")
}
- // Stop mesh services if app was fully initialized
- if (mainViewModel.onboardingState.value == OnboardingState.COMPLETE) {
- try {
- meshService.stopServices()
- Log.d("MainActivity", "Mesh services stopped successfully")
- } catch (e: Exception) {
- Log.w("MainActivity", "Error stopping mesh services in onDestroy: ${e.message}")
- }
- }
+ // Do not stop mesh here; ForegroundService owns lifecycle for background reliability
}
}
diff --git a/app/src/main/java/com/bitchat/android/core/ui/component/button/CloseButton.kt b/app/src/main/java/com/bitchat/android/core/ui/component/button/CloseButton.kt
new file mode 100644
index 00000000..96f408bc
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/core/ui/component/button/CloseButton.kt
@@ -0,0 +1,34 @@
+package com.bitchat.android.core.ui.component.button
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun CloseButton(
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier.Companion
+) {
+ IconButton(
+ onClick = onClick,
+ modifier = modifier
+ .size(32.dp),
+ colors = IconButtonDefaults.iconButtonColors(
+ contentColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.6f),
+ containerColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.1f)
+ )
+ ) {
+ Icon(
+ imageVector = Icons.Default.Close,
+ contentDescription = "Close",
+ modifier = Modifier.Companion.size(18.dp)
+ )
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bitchat/android/geohash/GeohashBookmarksStore.kt b/app/src/main/java/com/bitchat/android/geohash/GeohashBookmarksStore.kt
index b498dd83..d4ccb9bf 100644
--- a/app/src/main/java/com/bitchat/android/geohash/GeohashBookmarksStore.kt
+++ b/app/src/main/java/com/bitchat/android/geohash/GeohashBookmarksStore.kt
@@ -5,13 +5,14 @@ import android.location.Geocoder
import android.location.Location
import android.location.LocationManager
import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
import java.util.Locale
/**
@@ -46,11 +47,11 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
private val membership = mutableSetOf()
- private val _bookmarks = MutableLiveData>(emptyList())
- val bookmarks: LiveData> = _bookmarks
+ private val _bookmarks = MutableStateFlow>(emptyList())
+ val bookmarks: StateFlow> = _bookmarks.asStateFlow()
- private val _bookmarkNames = MutableLiveData>(emptyMap())
- val bookmarkNames: LiveData> = _bookmarkNames
+ private val _bookmarkNames = MutableStateFlow>(emptyMap())
+ val bookmarkNames: StateFlow> = _bookmarkNames.asStateFlow()
// For throttling / preventing duplicate geocode lookups
private val resolving = mutableSetOf()
@@ -68,8 +69,8 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
val gh = normalize(geohash)
if (gh.isEmpty() || membership.contains(gh)) return
membership.add(gh)
- val updated = listOf(gh) + (_bookmarks.value ?: emptyList())
- _bookmarks.postValue(updated)
+ val updated = listOf(gh) + (_bookmarks.value)
+ _bookmarks.value = updated
persist(updated)
// Resolve friendly name asynchronously
resolveNameIfNeeded(gh)
@@ -79,12 +80,12 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
val gh = normalize(geohash)
if (!membership.contains(gh)) return
membership.remove(gh)
- val updated = (_bookmarks.value ?: emptyList()).filterNot { it == gh }
- _bookmarks.postValue(updated)
+ val updated = (_bookmarks.value).filterNot { it == gh }
+ _bookmarks.value = updated
// Remove stored name to avoid stale cache growth
- val names = _bookmarkNames.value?.toMutableMap() ?: mutableMapOf()
+ val names = _bookmarkNames.value.toMutableMap()
if (names.remove(gh) != null) {
- _bookmarkNames.postValue(names)
+ _bookmarkNames.value = names
persistNames(names)
}
persist(updated)
@@ -108,7 +109,7 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
}
}
membership.clear(); membership.addAll(seen)
- _bookmarks.postValue(ordered)
+ _bookmarks.value = ordered
}
} catch (e: Exception) {
Log.e(TAG, "Failed to load bookmarks: ${e.message}")
@@ -118,7 +119,7 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
if (!namesJson.isNullOrEmpty()) {
val mapType = object : TypeToken>() {}.type
val dict = gson.fromJson>(namesJson, mapType)
- _bookmarkNames.postValue(dict)
+ _bookmarkNames.value = dict
}
} catch (e: Exception) {
Log.e(TAG, "Failed to load bookmark names: ${e.message}")
@@ -127,14 +128,14 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
private fun persist() {
try {
- val json = gson.toJson(_bookmarks.value ?: emptyList())
+ val json = gson.toJson(_bookmarks.value)
prefs.edit().putString(STORE_KEY, json).apply()
} catch (_: Exception) {}
}
private fun persistNames() {
try {
- val json = gson.toJson(_bookmarkNames.value ?: emptyMap())
+ val json = gson.toJson(_bookmarkNames.value)
prefs.edit().putString(NAMES_STORE_KEY, json).apply()
} catch (_: Exception) {}
}
@@ -144,8 +145,8 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
fun clearAll() {
try {
membership.clear()
- _bookmarks.postValue(emptyList())
- _bookmarkNames.postValue(emptyMap())
+ _bookmarks.value = emptyList()
+ _bookmarkNames.value = emptyMap()
prefs.edit()
.remove(STORE_KEY)
.remove(NAMES_STORE_KEY)
@@ -209,9 +210,9 @@ class GeohashBookmarksStore private constructor(private val context: Context) {
}
if (!name.isNullOrEmpty()) {
- val current = _bookmarkNames.value?.toMutableMap() ?: mutableMapOf()
+ val current = _bookmarkNames.value.toMutableMap()
current[gh] = name
- _bookmarkNames.postValue(current)
+ _bookmarkNames.value = current
persistNames(current)
}
} catch (e: Exception) {
diff --git a/app/src/main/java/com/bitchat/android/geohash/LocationChannelManager.kt b/app/src/main/java/com/bitchat/android/geohash/LocationChannelManager.kt
index b8da1fee..9c18a859 100644
--- a/app/src/main/java/com/bitchat/android/geohash/LocationChannelManager.kt
+++ b/app/src/main/java/com/bitchat/android/geohash/LocationChannelManager.kt
@@ -10,12 +10,12 @@ import android.location.LocationManager
import android.os.Bundle
import android.util.Log
import androidx.core.app.ActivityCompat
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
import kotlinx.coroutines.*
import java.util.*
import com.google.gson.Gson
import com.google.gson.JsonSyntaxException
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
/**
* Manages location permissions, one-shot location retrieval, and computing geohash channels.
@@ -53,28 +53,26 @@ class LocationChannelManager private constructor(private val context: Context) {
private var dataManager: com.bitchat.android.ui.DataManager? = null
// Published state for UI bindings (matching iOS @Published properties)
- private val _permissionState = MutableLiveData(PermissionState.NOT_DETERMINED)
- val permissionState: LiveData = _permissionState
+ private val _permissionState = MutableStateFlow(PermissionState.NOT_DETERMINED)
+ val permissionState: StateFlow = _permissionState
- private val _availableChannels = MutableLiveData>(emptyList())
- val availableChannels: LiveData> = _availableChannels
+ private val _availableChannels = MutableStateFlow>(emptyList())
+ val availableChannels: StateFlow> = _availableChannels
- private val _selectedChannel = MutableLiveData(ChannelID.Mesh)
- val selectedChannel: LiveData = _selectedChannel
+ private val _selectedChannel = MutableStateFlow(ChannelID.Mesh)
+ val selectedChannel: StateFlow = _selectedChannel
- private val _teleported = MutableLiveData(false)
- val teleported: LiveData = _teleported
+ private val _teleported = MutableStateFlow(false)
+ val teleported: StateFlow = _teleported
- private val _locationNames = MutableLiveData>(emptyMap())
- val locationNames: LiveData> = _locationNames
+ private val _locationNames = MutableStateFlow>(emptyMap())
+ val locationNames: StateFlow> = _locationNames
- // Add a new LiveData property to indicate when location is being fetched
- private val _isLoadingLocation = MutableLiveData(false)
- val isLoadingLocation: LiveData = _isLoadingLocation
+ private val _isLoadingLocation = MutableStateFlow(false)
+ val isLoadingLocation: StateFlow = _isLoadingLocation
- // Add a new LiveData property to track if location services are enabled by user
- private val _locationServicesEnabled = MutableLiveData(false)
- val locationServicesEnabled: LiveData = _locationServicesEnabled
+ private val _locationServicesEnabled = MutableStateFlow(false)
+ val locationServicesEnabled: StateFlow = _locationServicesEnabled
init {
updatePermissionState()
@@ -102,15 +100,15 @@ class LocationChannelManager private constructor(private val context: Context) {
when (getCurrentPermissionStatus()) {
PermissionState.NOT_DETERMINED -> {
Log.d(TAG, "Permission not determined - user needs to grant in app settings")
- _permissionState.postValue(PermissionState.NOT_DETERMINED)
+ _permissionState.value = PermissionState.NOT_DETERMINED
}
PermissionState.DENIED, PermissionState.RESTRICTED -> {
Log.d(TAG, "Permission denied or restricted")
- _permissionState.postValue(PermissionState.DENIED)
+ _permissionState.value = PermissionState.DENIED
}
PermissionState.AUTHORIZED -> {
Log.d(TAG, "Permission authorized - requesting location")
- _permissionState.postValue(PermissionState.AUTHORIZED)
+ _permissionState.value = PermissionState.AUTHORIZED
requestOneShotLocation()
}
}
@@ -180,7 +178,7 @@ class LocationChannelManager private constructor(private val context: Context) {
lastLocation?.let { location ->
when (channel) {
is ChannelID.Mesh -> {
- _teleported.postValue(false)
+ _teleported.value = false
}
is ChannelID.Location -> {
val currentGeohash = Geohash.encode(
@@ -189,7 +187,7 @@ class LocationChannelManager private constructor(private val context: Context) {
precision = channel.channel.level.precision
)
val isTeleportedNow = currentGeohash != channel.channel.geohash
- _teleported.postValue(isTeleportedNow)
+ _teleported.value = isTeleportedNow
Log.d(TAG, "Teleported (immediate recompute): $isTeleportedNow (current: $currentGeohash, selected: ${channel.channel.geohash})")
}
}
@@ -201,7 +199,7 @@ class LocationChannelManager private constructor(private val context: Context) {
*/
fun setTeleported(teleported: Boolean) {
Log.d(TAG, "Setting teleported status: $teleported")
- _teleported.postValue(teleported)
+ _teleported.value = teleported
}
/**
@@ -209,7 +207,7 @@ class LocationChannelManager private constructor(private val context: Context) {
*/
fun enableLocationServices() {
Log.d(TAG, "enableLocationServices() called by user")
- _locationServicesEnabled.postValue(true)
+ _locationServicesEnabled.value = true
saveLocationServicesState(true)
// If we have permission, start location operations
@@ -223,15 +221,15 @@ class LocationChannelManager private constructor(private val context: Context) {
*/
fun disableLocationServices() {
Log.d(TAG, "disableLocationServices() called by user")
- _locationServicesEnabled.postValue(false)
+ _locationServicesEnabled.value = false
saveLocationServicesState(false)
// Stop any ongoing location operations
endLiveRefresh()
// Clear available channels when location is disabled
- _availableChannels.postValue(emptyList())
- _locationNames.postValue(emptyMap())
+ _availableChannels.value = emptyList()
+ _locationNames.value = emptyMap()
// If user had a location channel selected, switch back to mesh
if (_selectedChannel.value is ChannelID.Location) {
@@ -243,7 +241,7 @@ class LocationChannelManager private constructor(private val context: Context) {
* Check if location services are enabled by the user
*/
fun isLocationServicesEnabled(): Boolean {
- return _locationServicesEnabled.value ?: false
+ return _locationServicesEnabled.value
}
// MARK: - Location Operations
@@ -280,13 +278,13 @@ class LocationChannelManager private constructor(private val context: Context) {
if (lastKnownLocation != null) {
Log.d(TAG, "Using last known location: ${lastKnownLocation.latitude}, ${lastKnownLocation.longitude}")
lastLocation = lastKnownLocation
- _isLoadingLocation.postValue(false) // Make sure loading state is off
+ _isLoadingLocation.value = false // Make sure loading state is off
computeChannels(lastKnownLocation)
reverseGeocodeIfNeeded(lastKnownLocation)
} else {
Log.d(TAG, "No last known location available")
// Set loading state to true so UI can show a spinner
- _isLoadingLocation.postValue(true)
+ _isLoadingLocation.value = true
// Request a fresh location only when we don't have a last known location
Log.d(TAG, "Requesting fresh location...")
@@ -294,7 +292,7 @@ class LocationChannelManager private constructor(private val context: Context) {
}
} catch (e: SecurityException) {
Log.e(TAG, "Security exception requesting location: ${e.message}")
- _isLoadingLocation.postValue(false) // Turn off loading state on error
+ _isLoadingLocation.value = false // Turn off loading state on error
updatePermissionState()
}
}
@@ -308,7 +306,7 @@ class LocationChannelManager private constructor(private val context: Context) {
reverseGeocodeIfNeeded(location)
// Update loading state to indicate we have a location now
- _isLoadingLocation.postValue(false)
+ _isLoadingLocation.value = false
// Remove this listener after getting the update
try {
@@ -322,13 +320,13 @@ class LocationChannelManager private constructor(private val context: Context) {
// Request a fresh location update using getCurrentLocation instead of continuous updates
private fun requestFreshLocation() {
if (!hasLocationPermission()) {
- _isLoadingLocation.postValue(false) // Turn off loading state if no permission
+ _isLoadingLocation.value = false // Turn off loading state if no permission
return
}
try {
// Set loading state to true to indicate we're actively trying to get a location
- _isLoadingLocation.postValue(true)
+ _isLoadingLocation.value = true
// Try common providers in order of preference
val providers = listOf(
@@ -358,7 +356,7 @@ class LocationChannelManager private constructor(private val context: Context) {
Log.w(TAG, "Received null location from getCurrentLocation")
}
// Update loading state to indicate we have a location now
- _isLoadingLocation.postValue(false)
+ _isLoadingLocation.value = false
}
)
} else {
@@ -378,14 +376,14 @@ class LocationChannelManager private constructor(private val context: Context) {
// If no provider was available, turn off loading state
if (!providerFound) {
Log.w(TAG, "No location providers available")
- _isLoadingLocation.postValue(false)
+ _isLoadingLocation.value = false
}
} catch (e: SecurityException) {
Log.e(TAG, "Security exception requesting location: ${e.message}")
- _isLoadingLocation.postValue(false) // Turn off loading state on error
+ _isLoadingLocation.value = false // Turn off loading state on error
} catch (e: Exception) {
Log.e(TAG, "Error requesting location: ${e.message}")
- _isLoadingLocation.postValue(false) // Turn off loading state on error
+ _isLoadingLocation.value = false // Turn off loading state on error
}
}
@@ -408,7 +406,7 @@ class LocationChannelManager private constructor(private val context: Context) {
private fun updatePermissionState() {
val newState = getCurrentPermissionStatus()
Log.d(TAG, "Permission state updated to: $newState")
- _permissionState.postValue(newState)
+ _permissionState.value = newState
}
private fun hasLocationPermission(): Boolean {
@@ -433,13 +431,13 @@ class LocationChannelManager private constructor(private val context: Context) {
Log.v(TAG, "Generated ${level.displayName}: $geohash")
}
- _availableChannels.postValue(result)
+ _availableChannels.value = result
// Recompute teleported status based on current location vs selected channel
val selectedChannelValue = _selectedChannel.value
when (selectedChannelValue) {
is ChannelID.Mesh -> {
- _teleported.postValue(false)
+ _teleported.value = false
}
is ChannelID.Location -> {
val currentGeohash = Geohash.encode(
@@ -448,12 +446,9 @@ class LocationChannelManager private constructor(private val context: Context) {
precision = selectedChannelValue.channel.level.precision
)
val isTeleported = currentGeohash != selectedChannelValue.channel.geohash
- _teleported.postValue(isTeleported)
+ _teleported.value = isTeleported
Log.d(TAG, "Teleported status: $isTeleported (current: $currentGeohash, selected: ${selectedChannelValue.channel.geohash})")
}
- null -> {
- _teleported.postValue(false)
- }
}
}
@@ -482,7 +477,7 @@ class LocationChannelManager private constructor(private val context: Context) {
val names = namesByLevel(address)
Log.d(TAG, "Reverse geocoding result: $names")
- _locationNames.postValue(names)
+ _locationNames.value = names
} else {
Log.w(TAG, "No reverse geocoding results")
}
@@ -601,26 +596,26 @@ class LocationChannelManager private constructor(private val context: Context) {
}
if (channel != null) {
- _selectedChannel.postValue(channel)
+ _selectedChannel.value = channel
Log.d(TAG, "Restored persisted channel: ${channel.displayName}")
} else {
Log.d(TAG, "Could not restore persisted channel, defaulting to Mesh")
- _selectedChannel.postValue(ChannelID.Mesh)
+ _selectedChannel.value = ChannelID.Mesh
}
} else {
Log.w(TAG, "Invalid channel data format in persistence")
- _selectedChannel.postValue(ChannelID.Mesh)
+ _selectedChannel.value = ChannelID.Mesh
}
} else {
Log.d(TAG, "No persisted channel found, defaulting to Mesh")
- _selectedChannel.postValue(ChannelID.Mesh)
+ _selectedChannel.value = ChannelID.Mesh
}
} catch (e: JsonSyntaxException) {
Log.e(TAG, "Failed to parse persisted channel data: ${e.message}")
- _selectedChannel.postValue(ChannelID.Mesh)
+ _selectedChannel.value = ChannelID.Mesh
} catch (e: Exception) {
Log.e(TAG, "Failed to load persisted channel: ${e.message}")
- _selectedChannel.postValue(ChannelID.Mesh)
+ _selectedChannel.value = ChannelID.Mesh
}
}
@@ -629,7 +624,7 @@ class LocationChannelManager private constructor(private val context: Context) {
*/
fun clearPersistedChannel() {
dataManager?.clearLastGeohashChannel()
- _selectedChannel.postValue(ChannelID.Mesh)
+ _selectedChannel.value = ChannelID.Mesh
Log.d(TAG, "Cleared persisted channel selection")
}
@@ -653,11 +648,11 @@ class LocationChannelManager private constructor(private val context: Context) {
private fun loadLocationServicesState() {
try {
val enabled = dataManager?.isLocationServicesEnabled() ?: false
- _locationServicesEnabled.postValue(enabled)
+ _locationServicesEnabled.value = enabled
Log.d(TAG, "Loaded location services state: $enabled")
} catch (e: Exception) {
Log.e(TAG, "Failed to load location services state: ${e.message}")
- _locationServicesEnabled.postValue(false)
+ _locationServicesEnabled.value = false
}
}
diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt
index 3ac87764..8e0fa15b 100644
--- a/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt
+++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt
@@ -149,6 +149,7 @@ class BluetoothConnectionManager(
try {
isActive = true
+ Log.d(TAG, "ConnectionManager activated (permissions and adapter OK)")
// set the adapter's name to our 8-character peerID for iOS privacy, TODO: Make this configurable
// try {
@@ -179,6 +180,7 @@ class BluetoothConnectionManager(
this@BluetoothConnectionManager.isActive = false
return@launch
}
+ Log.d(TAG, "GATT Server started")
} else {
Log.i(TAG, "GATT Server disabled by debug settings; not starting")
}
@@ -189,6 +191,7 @@ class BluetoothConnectionManager(
this@BluetoothConnectionManager.isActive = false
return@launch
}
+ Log.d(TAG, "GATT Client started")
} else {
Log.i(TAG, "GATT Client disabled by debug settings; not starting")
}
@@ -214,6 +217,7 @@ class BluetoothConnectionManager(
isActive = false
connectionScope.launch {
+ Log.d(TAG, "Stopping client/server and power components...")
// Stop component managers
clientManager.stop()
serverManager.stop()
@@ -230,6 +234,18 @@ class BluetoothConnectionManager(
Log.i(TAG, "All Bluetooth services stopped")
}
}
+
+ /**
+ * Indicates whether this instance can be safely reused for a future start.
+ * Returns false if its coroutine scope has been cancelled.
+ */
+ fun isReusable(): Boolean {
+ val active = connectionScope.isActive
+ if (!active) {
+ Log.d(TAG, "BluetoothConnectionManager isReusable=false (scope cancelled)")
+ }
+ return active
+ }
/**
* Set app background state for power optimization
diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
index dd12138d..3de48407 100644
--- a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
+++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
@@ -52,6 +52,12 @@ class BluetoothMeshService(private val context: Context) {
internal val connectionManager = BluetoothConnectionManager(context, myPeerID, fragmentManager) // Made internal for access
private val packetProcessor = PacketProcessor(myPeerID)
private lateinit var gossipSyncManager: GossipSyncManager
+ // Service-level notification manager for background (no-UI) DMs
+ private val serviceNotificationManager = com.bitchat.android.ui.NotificationManager(
+ context.applicationContext,
+ androidx.core.app.NotificationManagerCompat.from(context.applicationContext),
+ com.bitchat.android.util.NotificationIntervalManager()
+ )
// Service state management
private var isActive = false
@@ -61,8 +67,11 @@ class BluetoothMeshService(private val context: Context) {
// Coroutines
private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+ // Tracks whether this instance has been terminated via stopServices()
+ private var terminated = false
init {
+ Log.i(TAG, "Initializing BluetoothMeshService for peer=$myPeerID")
setupDelegates()
messageHandler.packetProcessor = packetProcessor
//startPeriodicDebugLogging()
@@ -98,6 +107,7 @@ class BluetoothMeshService(private val context: Context) {
return signPacketBeforeBroadcast(packet)
}
}
+ Log.d(TAG, "Delegates set up; GossipSyncManager initialized")
}
/**
@@ -105,6 +115,7 @@ class BluetoothMeshService(private val context: Context) {
*/
private fun startPeriodicDebugLogging() {
serviceScope.launch {
+ Log.d(TAG, "Starting periodic debug logging loop")
while (isActive) {
try {
delay(10000) // 10 seconds
@@ -116,6 +127,7 @@ class BluetoothMeshService(private val context: Context) {
Log.e(TAG, "Error in periodic debug logging: ${e.message}")
}
}
+ Log.d(TAG, "Periodic debug logging loop ended (isActive=$isActive)")
}
}
@@ -124,6 +136,7 @@ class BluetoothMeshService(private val context: Context) {
*/
private fun sendPeriodicBroadcastAnnounce() {
serviceScope.launch {
+ Log.d(TAG, "Starting periodic announce loop")
while (isActive) {
try {
delay(30000) // 30 seconds
@@ -132,6 +145,7 @@ class BluetoothMeshService(private val context: Context) {
Log.e(TAG, "Error in periodic broadcast announce: ${e.message}")
}
}
+ Log.d(TAG, "Periodic announce loop ended (isActive=$isActive)")
}
}
@@ -139,6 +153,7 @@ class BluetoothMeshService(private val context: Context) {
* Setup delegate connections between components
*/
private fun setupDelegates() {
+ Log.d(TAG, "Setting up component delegates")
// Provide nickname resolver to BLE broadcaster for detailed logs
try {
connectionManager.setNicknameResolver { pid -> peerManager.getPeerNickname(pid) }
@@ -146,6 +161,9 @@ class BluetoothMeshService(private val context: Context) {
// PeerManager delegates to main mesh service delegate
peerManager.delegate = object : PeerManagerDelegate {
override fun onPeerListUpdated(peerIDs: List) {
+ // Update process-wide state first
+ try { com.bitchat.android.services.AppStateStore.setPeers(peerIDs) } catch (_: Exception) { }
+ // Then notify UI delegate if attached
delegate?.didUpdatePeerList(peerIDs)
}
override fun onPeerRemoved(peerID: String) {
@@ -165,6 +183,7 @@ class BluetoothMeshService(private val context: Context) {
override fun onKeyExchangeCompleted(peerID: String, peerPublicKeyData: ByteArray) {
// Send announcement and cached messages after key exchange
serviceScope.launch {
+ Log.d(TAG, "Key exchange completed with $peerID; sending follow-ups")
delay(100)
sendAnnouncementToPeer(peerID)
@@ -352,7 +371,36 @@ class BluetoothMeshService(private val context: Context) {
// Callbacks
override fun onMessageReceived(message: BitchatMessage) {
+ // Always reflect into process-wide store so UI can hydrate after recreation
+ try {
+ when {
+ message.isPrivate -> {
+ val peer = message.senderPeerID ?: ""
+ if (peer.isNotEmpty()) com.bitchat.android.services.AppStateStore.addPrivateMessage(peer, message)
+ }
+ message.channel != null -> {
+ com.bitchat.android.services.AppStateStore.addChannelMessage(message.channel!!, message)
+ }
+ else -> {
+ com.bitchat.android.services.AppStateStore.addPublicMessage(message)
+ }
+ }
+ } catch (_: Exception) { }
+ // And forward to UI delegate if attached
delegate?.didReceiveMessage(message)
+
+ // If no UI delegate attached (app closed), show DM notification via service manager
+ if (delegate == null && message.isPrivate) {
+ try {
+ val senderPeerID = message.senderPeerID
+ if (senderPeerID != null) {
+ val nick = try { peerManager.getPeerNickname(senderPeerID) } catch (_: Exception) { null } ?: senderPeerID
+ val preview = com.bitchat.android.ui.NotificationTextUtils.buildPrivateMessagePreview(message)
+ serviceNotificationManager.setAppBackgroundState(true)
+ serviceNotificationManager.showPrivateMessageNotification(senderPeerID, nick, preview)
+ }
+ } catch (_: Exception) { }
+ }
}
override fun onChannelLeave(channel: String, fromPeer: String) {
@@ -477,12 +525,23 @@ class BluetoothMeshService(private val context: Context) {
// BluetoothConnectionManager delegates
connectionManager.delegate = object : BluetoothConnectionManagerDelegate {
override fun onPacketReceived(packet: BitchatPacket, peerID: String, device: android.bluetooth.BluetoothDevice?) {
+ // Log incoming for debug graphs (do not double-count anywhere else)
+ try {
+ val nick = getPeerNicknames()[peerID]
+ com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().logIncoming(
+ packetType = packet.type.toString(),
+ fromPeerID = peerID,
+ fromNickname = nick,
+ fromDeviceAddress = device?.address
+ )
+ } catch (_: Exception) { }
packetProcessor.processPacket(RoutedPacket(packet, peerID, device?.address))
}
override fun onDeviceConnected(device: android.bluetooth.BluetoothDevice) {
// Send initial announcements after services are ready
serviceScope.launch {
+ Log.d(TAG, "Device connected: ${device.address}; scheduling announce")
delay(200)
sendBroadcastAnnounce()
}
@@ -497,6 +556,7 @@ class BluetoothMeshService(private val context: Context) {
}
override fun onDeviceDisconnected(device: android.bluetooth.BluetoothDevice) {
+ Log.d(TAG, "Device disconnected: ${device.address}")
val addr = device.address
// Remove mapping and, if that was the last direct path for the peer, clear direct flag
val peer = connectionManager.addressPeerMap[addr]
@@ -535,6 +595,11 @@ class BluetoothMeshService(private val context: Context) {
Log.w(TAG, "Mesh service already active, ignoring duplicate start request")
return
}
+ if (terminated) {
+ // This instance's scope was cancelled previously; refuse to start to avoid using dead scopes.
+ Log.e(TAG, "Mesh service instance was terminated; create a new instance instead of restarting")
+ return
+ }
Log.i(TAG, "Starting Bluetooth mesh service with peer ID: $myPeerID")
@@ -546,6 +611,7 @@ class BluetoothMeshService(private val context: Context) {
Log.d(TAG, "Started periodic broadcast announcements (every 30 seconds)")
// Start periodic syncs
gossipSyncManager.start()
+ Log.d(TAG, "GossipSyncManager started")
} else {
Log.e(TAG, "Failed to start Bluetooth services")
}
@@ -567,11 +633,14 @@ class BluetoothMeshService(private val context: Context) {
sendLeaveAnnouncement()
serviceScope.launch {
+ Log.d(TAG, "Stopping subcomponents and cancelling scope...")
delay(200) // Give leave message time to send
// Stop all components
gossipSyncManager.stop()
+ Log.d(TAG, "GossipSyncManager stopped")
connectionManager.stopServices()
+ Log.d(TAG, "BluetoothConnectionManager stop requested")
peerManager.shutdown()
fragmentManager.shutdown()
securityManager.shutdown()
@@ -579,9 +648,24 @@ class BluetoothMeshService(private val context: Context) {
messageHandler.shutdown()
packetProcessor.shutdown()
+ // Mark this instance as terminated and cancel its scope so it won't be reused
+ terminated = true
serviceScope.cancel()
+ Log.i(TAG, "BluetoothMeshService terminated and scope cancelled")
}
}
+
+ /**
+ * Whether this instance can be safely reused. Returns false after stopServices() or if
+ * any critical internal scope has been cancelled.
+ */
+ fun isReusable(): Boolean {
+ val reusable = !terminated && serviceScope.isActive && connectionManager.isReusable()
+ if (!reusable) {
+ Log.d(TAG, "isReusable=false (terminated=$terminated, scopeActive=${serviceScope.isActive}, connReusable=${connectionManager.isReusable()})")
+ }
+ return reusable
+ }
/**
* Send public message
@@ -801,7 +885,7 @@ class BluetoothMeshService(private val context: Context) {
fun sendReadReceipt(messageID: String, recipientPeerID: String, readerNickname: String) {
serviceScope.launch {
Log.d(TAG, "📖 Sending read receipt for message $messageID to $recipientPeerID")
-
+
// Route geohash read receipts via MessageRouter instead of here
val geo = runCatching { com.bitchat.android.services.MessageRouter.tryGetInstance() }.getOrNull()
val isGeoAlias = try {
@@ -812,8 +896,15 @@ class BluetoothMeshService(private val context: Context) {
geo.sendReadReceipt(com.bitchat.android.model.ReadReceipt(messageID), recipientPeerID)
return@launch
}
-
+
try {
+ // Avoid duplicate read receipts: check persistent store first
+ val seenStore = try { com.bitchat.android.services.SeenMessageStore.getInstance(context.applicationContext) } catch (_: Exception) { null }
+ if (seenStore?.hasRead(messageID) == true) {
+ Log.d(TAG, "Skipping read receipt for $messageID - already marked read")
+ return@launch
+ }
+
// Create read receipt payload using NoisePayloadType exactly like iOS
val readReceiptPayload = com.bitchat.android.model.NoisePayload(
type = com.bitchat.android.model.NoisePayloadType.READ_RECEIPT,
@@ -839,7 +930,10 @@ class BluetoothMeshService(private val context: Context) {
val signedPacket = signPacketBeforeBroadcast(packet)
connectionManager.broadcastPacket(RoutedPacket(signedPacket))
Log.d(TAG, "📤 Sent read receipt to $recipientPeerID for message $messageID")
-
+
+ // Persist as read after successful send
+ try { seenStore?.markRead(messageID) } catch (_: Exception) { }
+
} catch (e: Exception) {
Log.e(TAG, "Failed to send read receipt to $recipientPeerID: ${e.message}")
}
@@ -852,7 +946,7 @@ class BluetoothMeshService(private val context: Context) {
fun sendBroadcastAnnounce() {
Log.d(TAG, "Sending broadcast announce")
serviceScope.launch {
- val nickname = delegate?.getNickname() ?: myPeerID
+ val nickname = try { com.bitchat.android.services.NicknameProvider.getNickname(context, myPeerID) } catch (_: Exception) { myPeerID }
// Get the static public key for the announcement
val staticKey = encryptionService.getStaticPublicKey()
@@ -901,7 +995,7 @@ class BluetoothMeshService(private val context: Context) {
fun sendAnnouncementToPeer(peerID: String) {
if (peerManager.hasAnnouncedToPeer(peerID)) return
- val nickname = delegate?.getNickname() ?: myPeerID
+ val nickname = try { com.bitchat.android.services.NicknameProvider.getNickname(context, myPeerID) } catch (_: Exception) { myPeerID }
// Get the static public key for the announcement
val staticKey = encryptionService.getStaticPublicKey()
@@ -1000,6 +1094,13 @@ class BluetoothMeshService(private val context: Context) {
return peerManager.getFingerprintForPeer(peerID)
}
+ /**
+ * Get current active peer count (for status/notifications)
+ */
+ fun getActivePeerCount(): Int {
+ return try { peerManager.getActivePeerCount() } catch (_: Exception) { 0 }
+ }
+
/**
* Get peer info for verification purposes
*/
diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothPacketBroadcaster.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothPacketBroadcaster.kt
index b3474217..04e5d756 100644
--- a/app/src/main/java/com/bitchat/android/mesh/BluetoothPacketBroadcaster.kt
+++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothPacketBroadcaster.kt
@@ -73,9 +73,17 @@ class BluetoothPacketBroadcaster(
try {
val fromNick = incomingPeer?.let { nicknameResolver?.invoke(it) }
val toNick = toPeer?.let { nicknameResolver?.invoke(it) }
- val isRelay = (incomingAddr != null || incomingPeer != null)
-
- com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().logPacketRelayDetailed(
+ val manager = com.bitchat.android.ui.debug.DebugSettingsManager.getInstance()
+ // Always log outgoing for the actual transmission target
+ manager.logOutgoing(
+ packetType = typeName,
+ toPeerID = toPeer,
+ toNickname = toNick,
+ toDeviceAddress = toDeviceAddress,
+ previousHopPeerID = incomingPeer
+ )
+ // Keep the verbose relay message for human readability
+ manager.logPacketRelayDetailed(
packetType = typeName,
senderPeerID = senderPeerID,
senderNickname = senderNick,
@@ -86,7 +94,7 @@ class BluetoothPacketBroadcaster(
toNickname = toNick,
toDeviceAddress = toDeviceAddress,
ttl = ttl,
- isRelay = isRelay
+ isRelay = true
)
} catch (_: Exception) {
// Silently ignore debug logging failures
diff --git a/app/src/main/java/com/bitchat/android/mesh/PowerManager.kt b/app/src/main/java/com/bitchat/android/mesh/PowerManager.kt
index 9db444e6..46bc394f 100644
--- a/app/src/main/java/com/bitchat/android/mesh/PowerManager.kt
+++ b/app/src/main/java/com/bitchat/android/mesh/PowerManager.kt
@@ -224,26 +224,29 @@ class PowerManager(private val context: Context) {
}
private fun updatePowerMode() {
- val newMode = when {
- // Always use performance mode when charging (unless in background too long)
+ // Determine the base mode from battery/charging state only
+ val baseMode = when {
+ // Charging in foreground may use performance
isCharging && !isAppInBackground -> PowerMode.PERFORMANCE
-
- // Critical battery - use ultra low power
+
+ // Critical battery - force ultra low power regardless of foreground/background
batteryLevel <= CRITICAL_BATTERY -> PowerMode.ULTRA_LOW_POWER
-
- // Low battery - use power saver
+
+ // Low battery - prefer power saver
batteryLevel <= LOW_BATTERY -> PowerMode.POWER_SAVER
-
- // Background app with medium battery - use power saver
- isAppInBackground && batteryLevel <= MEDIUM_BATTERY -> PowerMode.POWER_SAVER
-
- // Background app with good battery - use balanced
- isAppInBackground -> PowerMode.BALANCED
-
- // Foreground with good battery - use balanced
+
+ // Otherwise balanced
else -> PowerMode.BALANCED
}
-
+
+ // If app is in background (including when running as a foreground service),
+ // cap the power mode to at least POWER_SAVER. Preserve ULTRA_LOW_POWER.
+ val newMode = if (isAppInBackground) {
+ if (baseMode == PowerMode.ULTRA_LOW_POWER) PowerMode.ULTRA_LOW_POWER else PowerMode.POWER_SAVER
+ } else {
+ baseMode
+ }
+
if (newMode != currentMode) {
val oldMode = currentMode
currentMode = newMode
diff --git a/app/src/main/java/com/bitchat/android/net/TorManager.kt b/app/src/main/java/com/bitchat/android/net/ArtiTorManager.kt
similarity index 52%
rename from app/src/main/java/com/bitchat/android/net/TorManager.kt
rename to app/src/main/java/com/bitchat/android/net/ArtiTorManager.kt
index b7c2230d..8dc0cad8 100644
--- a/app/src/main/java/com/bitchat/android/net/TorManager.kt
+++ b/app/src/main/java/com/bitchat/android/net/ArtiTorManager.kt
@@ -2,6 +2,7 @@ package com.bitchat.android.net
import android.app.Application
import android.util.Log
+import com.bitchat.android.util.AppConstants
import info.guardianproject.arti.ArtiLogListener
import info.guardianproject.arti.ArtiProxy
import kotlinx.coroutines.CoroutineScope
@@ -11,6 +12,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.update
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.launch
@@ -24,54 +26,97 @@ import java.util.concurrent.atomic.AtomicReference
import java.util.concurrent.atomic.AtomicLong
/**
- * Manages embedded Tor lifecycle & provides SOCKS proxy address.
- * Uses Arti (Tor in Rust) for improved security and reliability.
+ * Tor provider implementation using custom-built Arti (Tor-in-Rust).
+ *
+ * This singleton provides Tor anonymity features using a custom Arti build
+ * compiled with 16KB page size support for Google Play compliance.
+ *
+ * Based on the original TorManager implementation.
*/
-object TorManager {
- private const val TAG = "TorManager"
- private const val DEFAULT_SOCKS_PORT = com.bitchat.android.util.AppConstants.Tor.DEFAULT_SOCKS_PORT
- private const val RESTART_DELAY_MS = com.bitchat.android.util.AppConstants.Tor.RESTART_DELAY_MS // 2 seconds between stop/start
- private const val INACTIVITY_TIMEOUT_MS = com.bitchat.android.util.AppConstants.Tor.INACTIVITY_TIMEOUT_MS // 5 seconds of no activity before restart
- private const val MAX_RETRY_ATTEMPTS = com.bitchat.android.util.AppConstants.Tor.MAX_RETRY_ATTEMPTS
- private const val STOP_TIMEOUT_MS = com.bitchat.android.util.AppConstants.Tor.STOP_TIMEOUT_MS
+class ArtiTorManager private constructor() {
+ enum class TorState {
+ OFF,
+ STARTING,
+ BOOTSTRAPPING,
+ RUNNING,
+ STOPPING,
+ ERROR
+ }
+
+ data class TorStatus(
+ val mode: TorMode = TorMode.OFF,
+ val running: Boolean = false,
+ val bootstrapPercent: Int = 0,
+ val lastLogLine: String = "",
+ val state: TorState = TorState.OFF
+ )
+
+ companion object {
+ private const val TAG = "ArtiTorManager"
+ private const val DEFAULT_SOCKS_PORT = AppConstants.Tor.DEFAULT_SOCKS_PORT
+ private const val RESTART_DELAY_MS = AppConstants.Tor.RESTART_DELAY_MS
+ private const val INACTIVITY_TIMEOUT_MS = AppConstants.Tor.INACTIVITY_TIMEOUT_MS
+ private const val MAX_RETRY_ATTEMPTS = AppConstants.Tor.MAX_RETRY_ATTEMPTS
+ private const val STOP_TIMEOUT_MS = AppConstants.Tor.STOP_TIMEOUT_MS
+
+ @Volatile
+ private var INSTANCE: ArtiTorManager? = null
+
+ fun getInstance(): ArtiTorManager {
+ return INSTANCE ?: synchronized(this) {
+ INSTANCE ?: ArtiTorManager().also { INSTANCE = it }
+ }
+ }
+ }
private val appScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
- @Volatile private var initialized = false
- @Volatile private var socksAddr: InetSocketAddress? = null
- private val artiProxyRef = AtomicReference(null)
- @Volatile private var lastMode: TorMode = TorMode.OFF
+ @Volatile
+ private var initialized = false
+ @Volatile
+ private var socksAddr: InetSocketAddress? = null
+ @Volatile
+ private var artiProxy: ArtiProxy? = null
+ @Volatile
+ private var lastMode: TorMode = TorMode.OFF
private val applyMutex = Mutex()
- @Volatile private var desiredMode: TorMode = TorMode.OFF
- @Volatile private var currentSocksPort: Int = DEFAULT_SOCKS_PORT
- @Volatile private var lastLogTime = AtomicLong(0L)
- @Volatile private var retryAttempts = 0
- @Volatile private var bindRetryAttempts = 0
+ @Volatile
+ private var desiredMode: TorMode = TorMode.OFF
+ @Volatile
+ private var currentSocksPort: Int = DEFAULT_SOCKS_PORT
+ @Volatile
+ private var lastLogTime = AtomicLong(0L)
+ @Volatile
+ private var retryAttempts = 0
+ @Volatile
+ private var bindRetryAttempts = 0
private var inactivityJob: Job? = null
private var retryJob: Job? = null
private var currentApplication: Application? = null
private enum class LifecycleState { STOPPED, STARTING, RUNNING, STOPPING }
- @Volatile private var lifecycleState: LifecycleState = LifecycleState.STOPPED
- enum class TorState { OFF, STARTING, BOOTSTRAPPING, RUNNING, STOPPING, ERROR }
+ @Volatile
+ private var lifecycleState: LifecycleState = LifecycleState.STOPPED
- data class TorStatus(
- val mode: TorMode = TorMode.OFF,
- val running: Boolean = false,
- val bootstrapPercent: Int = 0, // kept for backwards compatibility with UI; 0 or 100 only
- val lastLogLine: String = "",
- val state: TorState = TorState.OFF
+ private val _statusFlow = MutableStateFlow(
+ TorStatus(
+ mode = TorMode.OFF,
+ running = false,
+ bootstrapPercent = 0,
+ lastLogLine = "",
+ state = TorState.OFF
+ )
)
- private val _status = MutableStateFlow(TorStatus())
- val statusFlow: StateFlow = _status.asStateFlow()
+ val statusFlow: StateFlow = _statusFlow.asStateFlow()
private val stateChangeDeferred = AtomicReference?>(null)
fun isProxyEnabled(): Boolean {
- val s = _status.value
- return s.mode != TorMode.OFF && s.running && s.bootstrapPercent >= 100 && socksAddr != null && s.state == TorState.RUNNING
+ val s = _statusFlow.value
+ return s.mode != TorMode.OFF && s.running && s.bootstrapPercent >= 100 &&
+ socksAddr != null && s.state == TorState.RUNNING
}
fun init(application: Application) {
@@ -82,7 +127,21 @@ object TorManager {
currentApplication = application
TorPreferenceManager.init(application)
- // Apply saved mode at startup. If ON, set planned SOCKS immediately to avoid any leak.
+ val logListener = ArtiLogListener { logLine ->
+ val text = logLine ?: return@ArtiLogListener
+ val s = text
+ Log.i(TAG, "arti: $s")
+ lastLogTime.set(System.currentTimeMillis())
+ _statusFlow.update { it.copy(lastLogLine = s) }
+ handleArtiLogLine(s)
+ }
+
+ artiProxy = ArtiProxy.Builder(application)
+ .setSocksPort(currentSocksPort)
+ .setDnsPort(currentSocksPort + 1)
+ .setLogListener(logListener)
+ .build()
+
val savedMode = TorPreferenceManager.get(application)
if (savedMode == TorMode.ON) {
if (currentSocksPort < DEFAULT_SOCKS_PORT) {
@@ -90,13 +149,15 @@ object TorManager {
}
desiredMode = savedMode
socksAddr = InetSocketAddress("127.0.0.1", currentSocksPort)
- try { OkHttpProvider.reset() } catch (_: Throwable) { }
+ try {
+ OkHttpProvider.reset()
+ } catch (_: Throwable) {
+ } // Only reset OkHttp during init
}
appScope.launch {
applyMode(application, savedMode)
}
- // Observe changes
appScope.launch {
TorPreferenceManager.modeFlow.collect { mode ->
applyMode(application, mode)
@@ -112,53 +173,63 @@ object TorManager {
try {
desiredMode = mode
lastMode = mode
- val s = _status.value
- if (mode == s.mode && mode != TorMode.OFF && (lifecycleState == LifecycleState.STARTING || lifecycleState == LifecycleState.RUNNING)) {
- Log.i(TAG, "applyMode: already in progress/running mode=$mode, state=$lifecycleState; skip")
+ val s = _statusFlow.value
+ if (mode == s.mode && mode != TorMode.OFF &&
+ (lifecycleState == LifecycleState.STARTING || lifecycleState == LifecycleState.RUNNING)
+ ) {
+ Log.i(
+ TAG,
+ "applyMode: already in progress/running mode=$mode, state=$lifecycleState; skip"
+ )
return
}
when (mode) {
TorMode.OFF -> {
Log.i(TAG, "applyMode: OFF -> stopping tor")
lifecycleState = LifecycleState.STOPPING
- _status.value = _status.value.copy(mode = TorMode.OFF, running = false, bootstrapPercent = 0, state = TorState.STOPPING)
- stopArti() // non-suspending immediate request
- // Best-effort wait for STOPPED before we declare OFF
+ _statusFlow.value = _statusFlow.value.copy(
+ mode = TorMode.OFF,
+ running = false,
+ bootstrapPercent = 0,
+ state = TorState.STOPPING
+ )
+ stopArti()
waitForStateTransition(target = TorState.OFF, timeoutMs = STOP_TIMEOUT_MS)
socksAddr = null
- _status.value = _status.value.copy(mode = TorMode.OFF, running = false, bootstrapPercent = 0, state = TorState.OFF)
+ _statusFlow.value = _statusFlow.value.copy(
+ mode = TorMode.OFF,
+ running = false,
+ bootstrapPercent = 0,
+ state = TorState.OFF
+ )
currentSocksPort = DEFAULT_SOCKS_PORT
bindRetryAttempts = 0
lifecycleState = LifecycleState.STOPPED
- // Rebuild clients WITHOUT proxy and reconnect relays
- try {
- OkHttpProvider.reset()
- com.bitchat.android.nostr.NostrRelayManager.shared.resetAllConnections()
- } catch (_: Throwable) { }
+ resetNetworkConnections()
}
+
TorMode.ON -> {
Log.i(TAG, "applyMode: ON -> starting arti")
- // Reset port to default unless we're already using a higher port
if (currentSocksPort < DEFAULT_SOCKS_PORT) {
currentSocksPort = DEFAULT_SOCKS_PORT
}
bindRetryAttempts = 0
lifecycleState = LifecycleState.STARTING
- _status.value = _status.value.copy(mode = TorMode.ON, running = false, bootstrapPercent = 0, state = TorState.STARTING)
- // Immediately set the planned SOCKS address so all traffic is forced through it,
- // even before Tor is fully bootstrapped. This prevents any direct connections.
+ _statusFlow.value = _statusFlow.value.copy(
+ mode = TorMode.ON,
+ running = false,
+ bootstrapPercent = 0,
+ state = TorState.STARTING
+ )
socksAddr = InetSocketAddress("127.0.0.1", currentSocksPort)
- try { OkHttpProvider.reset() } catch (_: Throwable) { }
- try { com.bitchat.android.nostr.NostrRelayManager.shared.resetAllConnections() } catch (_: Throwable) { }
+ resetNetworkConnections()
startArti(application, useDelay = false)
- // Defer enabling proxy until bootstrap completes
appScope.launch {
waitUntilBootstrapped()
- if (_status.value.running && desiredMode == TorMode.ON) {
+ if (_statusFlow.value.running && desiredMode == TorMode.ON) {
socksAddr = InetSocketAddress("127.0.0.1", currentSocksPort)
Log.i(TAG, "Tor ON: proxy set to ${socksAddr}")
- OkHttpProvider.reset()
- try { com.bitchat.android.nostr.NostrRelayManager.shared.resetAllConnections() } catch (_: Throwable) { }
+ resetNetworkConnections()
}
}
}
@@ -171,84 +242,95 @@ object TorManager {
private suspend fun startArti(application: Application, useDelay: Boolean = false) {
try {
- // Ensure any previous instance is fully stopped before starting a new one
stopArtiAndWait()
-
Log.i(TAG, "Starting Arti on port $currentSocksPort…")
if (useDelay) {
delay(RESTART_DELAY_MS)
}
- val logListener = ArtiLogListener { logLine ->
- val text = logLine ?: return@ArtiLogListener
- val s = text.toString()
- Log.i(TAG, "arti: $s")
- lastLogTime.set(System.currentTimeMillis())
- _status.value = _status.value.copy(lastLogLine = s)
- handleArtiLogLine(s)
+ val proxy = artiProxy ?: run {
+ Log.e(TAG, "ArtiProxy not initialized! This should not happen.")
+ _statusFlow.update { it.copy(state = TorState.ERROR) }
+ return
}
- val proxy = ArtiProxy.Builder(application)
- .setSocksPort(currentSocksPort)
- .setDnsPort(currentSocksPort + 1)
- .setLogListener(logListener)
- .build()
-
- artiProxyRef.set(proxy)
proxy.start()
lastLogTime.set(System.currentTimeMillis())
- _status.value = _status.value.copy(running = true, bootstrapPercent = 0, state = TorState.STARTING)
+ _statusFlow.update {
+ it.copy(
+ running = true,
+ bootstrapPercent = 0,
+ state = TorState.STARTING
+ )
+ }
lifecycleState = LifecycleState.RUNNING
startInactivityMonitoring()
- // Removed onion service startup (BLE-only file transfer in this branch)
-
} catch (e: Exception) {
Log.e(TAG, "Error starting Arti on port $currentSocksPort: ${e.message}")
- _status.value = _status.value.copy(state = TorState.ERROR)
-
- // Check if this is a bind error
+ _statusFlow.update { it.copy(state = TorState.ERROR) }
+
val isBindError = isBindError(e)
if (isBindError && bindRetryAttempts < MAX_RETRY_ATTEMPTS) {
bindRetryAttempts++
currentSocksPort++
- Log.w(TAG, "Port bind failed (attempt $bindRetryAttempts/$MAX_RETRY_ATTEMPTS), retrying with port $currentSocksPort")
- // Update planned SOCKS address immediately so all new connections target the new port
+ Log.w(
+ TAG,
+ "Port bind failed (attempt $bindRetryAttempts/$MAX_RETRY_ATTEMPTS), retrying with port $currentSocksPort"
+ )
socksAddr = InetSocketAddress("127.0.0.1", currentSocksPort)
- try { OkHttpProvider.reset() } catch (_: Throwable) { }
- try { com.bitchat.android.nostr.NostrRelayManager.shared.resetAllConnections() } catch (_: Throwable) { }
- // Immediate retry with incremented port, no exponential backoff for bind errors
+ resetNetworkConnections()
startArti(application, useDelay = false)
} else if (isBindError) {
Log.e(TAG, "Max bind retry attempts reached ($MAX_RETRY_ATTEMPTS), giving up")
lifecycleState = LifecycleState.STOPPED
- _status.value = _status.value.copy(running = false, bootstrapPercent = 0, state = TorState.ERROR)
+ _statusFlow.update {
+ it.copy(
+ running = false,
+ bootstrapPercent = 0,
+ state = TorState.ERROR
+ )
+ }
} else {
- // For non-bind errors, use the existing retry mechanism
scheduleRetry(application)
}
}
}
-
- /**
- * Checks if the exception indicates a port binding failure
- */
+
private fun isBindError(exception: Exception): Boolean {
val message = exception.message?.lowercase() ?: ""
return message.contains("bind") ||
- message.contains("address already in use") ||
- message.contains("port") && message.contains("use") ||
- message.contains("permission denied") && message.contains("port") ||
- message.contains("could not bind")
+ message.contains("address already in use") ||
+ message.contains("port") && message.contains("use") ||
+ message.contains("permission denied") && message.contains("port") ||
+ message.contains("could not bind")
+ }
+
+ /**
+ * Reset network connections after Tor state changes.
+ * Rebuilds OkHttp clients and reconnects Nostr relays.
+ */
+ private fun resetNetworkConnections() {
+ try {
+ OkHttpProvider.reset()
+ } catch (_: Throwable) {
+ }
+ try {
+ com.bitchat.android.nostr.NostrRelayManager.shared.resetAllConnections()
+ } catch (_: Throwable) {
+ }
}
private fun stopArtiInternal() {
try {
- val proxy = artiProxyRef.getAndSet(null)
+ val proxy = artiProxy
if (proxy != null) {
Log.i(TAG, "Stopping Arti…")
- try { proxy.stop() } catch (_: Throwable) {}
+ try {
+ proxy.stop()
+ } catch (_: Throwable) {
+ }
}
stopInactivityMonitoring()
stopRetryMonitoring()
@@ -260,15 +342,16 @@ object TorManager {
private fun stopArti() {
stopArtiInternal()
socksAddr = null
- _status.value = _status.value.copy(running = false, bootstrapPercent = 0, state = TorState.STOPPING)
+ _statusFlow.value = _statusFlow.value.copy(
+ running = false,
+ bootstrapPercent = 0,
+ state = TorState.STOPPING
+ )
}
private suspend fun stopArtiAndWait(timeoutMs: Long = STOP_TIMEOUT_MS) {
- // Request stop
stopArtiInternal()
- // Wait for confirmation via logs (Stopped) or timeout
waitForStateTransition(target = TorState.OFF, timeoutMs = timeoutMs)
- // Small grace period before relaunch to let file locks clear
delay(200)
}
@@ -276,7 +359,7 @@ object TorManager {
Log.i(TAG, "Restarting Arti (keeping SOCKS proxy enabled)...")
stopArtiAndWait()
delay(RESTART_DELAY_MS)
- startArti(application, useDelay = false) // Already delayed above
+ startArti(application, useDelay = false)
}
private fun startInactivityMonitoring() {
@@ -287,13 +370,16 @@ object TorManager {
val currentTime = System.currentTimeMillis()
val lastActivity = lastLogTime.get()
val timeSinceLastActivity = currentTime - lastActivity
-
+
if (timeSinceLastActivity > INACTIVITY_TIMEOUT_MS) {
- val currentMode = _status.value.mode
+ val currentMode = _statusFlow.value.mode
if (currentMode == TorMode.ON) {
- val bootstrapPercent = _status.value.bootstrapPercent
+ val bootstrapPercent = _statusFlow.value.bootstrapPercent
if (bootstrapPercent < 100) {
- Log.w(TAG, "Inactivity detected (${timeSinceLastActivity}ms), restarting Arti")
+ Log.w(
+ TAG,
+ "Inactivity detected (${timeSinceLastActivity}ms), restarting Arti"
+ )
currentApplication?.let { app ->
appScope.launch {
restartArti(app)
@@ -316,11 +402,11 @@ object TorManager {
retryJob?.cancel()
if (retryAttempts < MAX_RETRY_ATTEMPTS) {
retryAttempts++
- val delayMs = (1000L * (1 shl retryAttempts)).coerceAtMost(30000L) // Exponential backoff, max 30s
+ val delayMs = (1000L * (1 shl retryAttempts)).coerceAtMost(30000L)
Log.w(TAG, "Scheduling Arti retry attempt $retryAttempts in ${delayMs}ms")
retryJob = appScope.launch {
delay(delayMs)
- val currentMode = _status.value.mode
+ val currentMode = _statusFlow.value.mode
if (currentMode == TorMode.ON) {
Log.i(TAG, "Retrying Arti start (attempt $retryAttempts)")
restartArti(application)
@@ -337,50 +423,110 @@ object TorManager {
}
private suspend fun waitUntilBootstrapped() {
- val current = _status.value
+ val current = _statusFlow.value
if (!current.running) return
if (current.bootstrapPercent >= 100 && current.state == TorState.RUNNING) return
- // Suspend until we observe RUNNING at least once
while (true) {
- val s = statusFlow.first { (it.bootstrapPercent >= 100 && it.state == TorState.RUNNING) || !it.running || it.state == TorState.ERROR }
+ val s = statusFlow.first {
+ (it.bootstrapPercent >= 100 && it.state == TorState.RUNNING) ||
+ !it.running ||
+ it.state == TorState.ERROR
+ }
if (!s.running || s.state == TorState.ERROR) return
if (s.bootstrapPercent >= 100 && s.state == TorState.RUNNING) return
}
}
private fun handleArtiLogLine(s: String) {
+ val currentState = _statusFlow.value.state
+ val currentLifecycle = lifecycleState
+
when {
s.contains("AMEx: state changed to Initialized", ignoreCase = true) -> {
- _status.value = _status.value.copy(state = TorState.STARTING)
+ if (currentLifecycle != LifecycleState.STARTING && currentLifecycle != LifecycleState.RUNNING) {
+ Log.w(TAG, "Ignoring stale 'Initialized' log (lifecycle: $currentLifecycle)")
+ return
+ }
+ _statusFlow.update { it.copy(state = TorState.STARTING) }
completeWaitersIf(TorState.STARTING)
}
+
s.contains("AMEx: state changed to Starting", ignoreCase = true) -> {
- _status.value = _status.value.copy(state = TorState.STARTING)
+ if (currentLifecycle != LifecycleState.STARTING && currentLifecycle != LifecycleState.RUNNING) {
+ Log.w(TAG, "Ignoring stale 'Starting' log (lifecycle: $currentLifecycle)")
+ return
+ }
+ _statusFlow.update { it.copy(state = TorState.STARTING) }
completeWaitersIf(TorState.STARTING)
}
- s.contains("Sufficiently bootstrapped; system SOCKS now functional", ignoreCase = true) -> {
- _status.value = _status.value.copy(bootstrapPercent = 75, state = TorState.BOOTSTRAPPING)
+
+ s.contains(
+ "Sufficiently bootstrapped; system SOCKS now functional",
+ ignoreCase = true
+ ) -> {
+ if (currentLifecycle != LifecycleState.RUNNING) {
+ Log.w(TAG, "Ignoring bootstrap log (lifecycle: $currentLifecycle)")
+ return
+ }
+ _statusFlow.update {
+ it.copy(
+ bootstrapPercent = 75,
+ state = TorState.BOOTSTRAPPING
+ )
+ }
retryAttempts = 0
bindRetryAttempts = 0
startInactivityMonitoring()
}
- //s.contains("AMEx: state changed to Running", ignoreCase = true) -> {
+
s.contains("We have found that guard [scrubbed] is usable.", ignoreCase = true) -> {
- // If we already saw Sufficiently bootstrapped, mark as RUNNING and ready.
- val bp = if (_status.value.bootstrapPercent >= 100) 100 else 100 // treat Running as ready
- _status.value = _status.value.copy(state = TorState.RUNNING, bootstrapPercent = bp, running = true)
+ if (currentLifecycle != LifecycleState.RUNNING) {
+ Log.w(TAG, "Ignoring guard discovery log (lifecycle: $currentLifecycle)")
+ return
+ }
+ _statusFlow.update {
+ it.copy(
+ state = TorState.RUNNING,
+ bootstrapPercent = 100,
+ running = true
+ )
+ }
completeWaitersIf(TorState.RUNNING)
}
+
s.contains("AMEx: state changed to Stopping", ignoreCase = true) -> {
- _status.value = _status.value.copy(state = TorState.STOPPING, running = false)
+ if (currentLifecycle != LifecycleState.STOPPING) {
+ Log.w(TAG, "Ignoring stale 'Stopping' log (lifecycle: $currentLifecycle)")
+ return
+ }
+ _statusFlow.update {
+ it.copy(
+ state = TorState.STOPPING,
+ running = false
+ )
+ }
}
+
s.contains("AMEx: state changed to Stopped", ignoreCase = true) -> {
- _status.value = _status.value.copy(state = TorState.OFF, running = false, bootstrapPercent = 0)
+ if (currentLifecycle != LifecycleState.STOPPING && currentLifecycle != LifecycleState.STOPPED) {
+ Log.w(
+ TAG,
+ "Ignoring stale 'Stopped' log (lifecycle: $currentLifecycle, preventing state corruption)"
+ )
+ return
+ }
+ _statusFlow.update {
+ it.copy(
+ state = TorState.OFF,
+ running = false,
+ bootstrapPercent = 0
+ )
+ }
completeWaitersIf(TorState.OFF)
}
+
s.contains("Another process has the lock on our state files", ignoreCase = true) -> {
- // Signal error; we'll likely need to wait longer before restart
- _status.value = _status.value.copy(state = TorState.ERROR)
+ _statusFlow.update { it.copy(state = TorState.ERROR) }
}
}
}
@@ -395,13 +541,11 @@ object TorManager {
val def = CompletableDeferred()
stateChangeDeferred.getAndSet(def)?.cancel()
return withTimeoutOrNull(timeoutMs) {
- // Fast-path: if we're already there
- val cur = _status.value.state
+ val cur = _statusFlow.value.state
if (cur == target) return@withTimeoutOrNull cur
def.await()
}
}
- // Visible for instrumentation tests to validate installation
- fun installResourcesForTest(application: Application): Boolean { return true }
+ fun isTorAvailable(): Boolean = true
}
diff --git a/app/src/main/java/com/bitchat/android/net/OkHttpProvider.kt b/app/src/main/java/com/bitchat/android/net/OkHttpProvider.kt
index 45cff773..aafc0d10 100644
--- a/app/src/main/java/com/bitchat/android/net/OkHttpProvider.kt
+++ b/app/src/main/java/com/bitchat/android/net/OkHttpProvider.kt
@@ -42,8 +42,9 @@ object OkHttpProvider {
private fun baseBuilderForCurrentProxy(): OkHttpClient.Builder {
val builder = OkHttpClient.Builder()
- val socks: InetSocketAddress? = TorManager.currentSocksAddress()
- // If a SOCKS address is defined, always use it. TorManager sets this as soon as Tor mode is ON,
+ val torProvider = ArtiTorManager.getInstance()
+ val socks: InetSocketAddress? = torProvider.currentSocksAddress()
+ // If a SOCKS address is defined, always use it. TorProvider sets this as soon as Tor mode is ON,
// even before bootstrap, to prevent any direct connections from occurring.
if (socks != null) {
val proxy = Proxy(Proxy.Type.SOCKS, socks)
diff --git a/app/src/main/java/com/bitchat/android/nostr/GeohashRepository.kt b/app/src/main/java/com/bitchat/android/nostr/GeohashRepository.kt
index c72c8e67..822606c2 100644
--- a/app/src/main/java/com/bitchat/android/nostr/GeohashRepository.kt
+++ b/app/src/main/java/com/bitchat/android/nostr/GeohashRepository.kt
@@ -2,7 +2,6 @@ package com.bitchat.android.nostr
import android.app.Application
import android.util.Log
-import androidx.lifecycle.LiveData
import com.bitchat.android.ui.ChatState
import com.bitchat.android.ui.GeoPerson
import java.util.Date
@@ -112,7 +111,7 @@ class GeohashRepository(
val geohash = currentGeohash
if (geohash == null) {
// Use postValue for thread safety - this can be called from background threads
- state.postGeohashPeople(emptyList())
+ state.setGeohashPeople(emptyList())
return
}
val cutoff = Date(System.currentTimeMillis() - 5 * 60 * 1000)
@@ -143,7 +142,7 @@ class GeohashRepository(
)
}.sortedByDescending { it.lastSeen }
// Use postValue for thread safety - this can be called from background threads
- state.postGeohashPeople(people)
+ state.setGeohashPeople(people)
}
fun updateReactiveParticipantCounts() {
@@ -155,7 +154,7 @@ class GeohashRepository(
counts[gh] = active
}
// Use postValue for thread safety - this can be called from background threads
- state.postGeohashParticipantCounts(counts)
+ state.setGeohashParticipantCounts(counts)
}
fun putNostrKeyMapping(tempKeyOrPeer: String, pubkeyHex: String) {
diff --git a/app/src/main/java/com/bitchat/android/nostr/LocationNotesManager.kt b/app/src/main/java/com/bitchat/android/nostr/LocationNotesManager.kt
index 655a9783..dc1a8e85 100644
--- a/app/src/main/java/com/bitchat/android/nostr/LocationNotesManager.kt
+++ b/app/src/main/java/com/bitchat/android/nostr/LocationNotesManager.kt
@@ -2,13 +2,14 @@ package com.bitchat.android.nostr
import android.util.Log
import androidx.annotation.MainThread
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
/**
* Manages location notes (kind=1 text notes with geohash tags)
- * iOS-compatible implementation with LiveData for Android UI binding
+ * iOS-compatible implementation with StateFlow for Android UI binding
*/
@MainThread
class LocationNotesManager private constructor() {
@@ -63,21 +64,21 @@ class LocationNotesManager private constructor() {
NO_RELAYS
}
- // Published state (LiveData for Android)
- private val _notes = MutableLiveData>(emptyList())
- val notes: LiveData> = _notes
+ // Published state (StateFlow for Android)
+ private val _notes = MutableStateFlow>(emptyList())
+ val notes: StateFlow> = _notes.asStateFlow()
- private val _geohash = MutableLiveData(null)
- val geohash: LiveData = _geohash
+ private val _geohash = MutableStateFlow(null)
+ val geohash: StateFlow = _geohash.asStateFlow()
- private val _initialLoadComplete = MutableLiveData(false)
- val initialLoadComplete: LiveData = _initialLoadComplete
+ private val _initialLoadComplete = MutableStateFlow(false)
+ val initialLoadComplete: StateFlow = _initialLoadComplete.asStateFlow()
- private val _state = MutableLiveData(State.IDLE)
- val state: LiveData = _state
+ private val _state = MutableStateFlow(State.IDLE)
+ val state: StateFlow = _state.asStateFlow()
- private val _errorMessage = MutableLiveData(null)
- val errorMessage: LiveData = _errorMessage
+ private val _errorMessage = MutableStateFlow(null)
+ val errorMessage: StateFlow = _errorMessage.asStateFlow()
// Private state
private var subscriptionIDs: MutableMap = mutableMapOf()
diff --git a/app/src/main/java/com/bitchat/android/nostr/NostrClient.kt b/app/src/main/java/com/bitchat/android/nostr/NostrClient.kt
index 9e34c34c..a4803157 100644
--- a/app/src/main/java/com/bitchat/android/nostr/NostrClient.kt
+++ b/app/src/main/java/com/bitchat/android/nostr/NostrClient.kt
@@ -2,9 +2,10 @@ package com.bitchat.android.nostr
import android.content.Context
import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
/**
* High-level Nostr client that manages identity, connections, and messaging
@@ -30,11 +31,11 @@ class NostrClient private constructor(private val context: Context) {
private var currentIdentity: NostrIdentity? = null
// Client state
- private val _isInitialized = MutableLiveData()
- val isInitialized: LiveData = _isInitialized
+ private val _isInitialized = MutableStateFlow(false)
+ val isInitialized: StateFlow = _isInitialized.asStateFlow()
- private val _currentNpub = MutableLiveData()
- val currentNpub: LiveData = _currentNpub
+ private val _currentNpub = MutableStateFlow(null)
+ val currentNpub: StateFlow = _currentNpub.asStateFlow()
// Message processing
private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
@@ -53,21 +54,21 @@ class NostrClient private constructor(private val context: Context) {
currentIdentity = NostrIdentityBridge.getCurrentNostrIdentity(context)
if (currentIdentity != null) {
- _currentNpub.postValue(currentIdentity!!.npub)
+ _currentNpub.value = currentIdentity!!.npub
Log.i(TAG, "✅ Nostr identity loaded: ${currentIdentity!!.getShortNpub()}")
// Connect to relays
relayManager.connect()
- _isInitialized.postValue(true)
+ _isInitialized.value = true
Log.i(TAG, "✅ Nostr client initialized successfully")
} else {
Log.e(TAG, "❌ Failed to load/create Nostr identity")
- _isInitialized.postValue(false)
+ _isInitialized.value = false
}
} catch (e: Exception) {
Log.e(TAG, "❌ Failed to initialize Nostr client: ${e.message}")
- _isInitialized.postValue(false)
+ _isInitialized.value = false
}
}
}
@@ -78,7 +79,7 @@ class NostrClient private constructor(private val context: Context) {
fun shutdown() {
Log.d(TAG, "Shutting down Nostr client")
relayManager.disconnect()
- _isInitialized.postValue(false)
+ _isInitialized.value = false
}
/**
@@ -227,12 +228,12 @@ class NostrClient private constructor(private val context: Context) {
/**
* Get relay connection status
*/
- val relayConnectionStatus: LiveData = relayManager.isConnected
+ val relayConnectionStatus: StateFlow = relayManager.isConnected
/**
* Get relay information
*/
- val relayInfo: LiveData> = relayManager.relays
+ val relayInfo: StateFlow> = relayManager.relays
// MARK: - Private Methods
diff --git a/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt b/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt
index eb5806bb..d44e6e0b 100644
--- a/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt
+++ b/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt
@@ -1,9 +1,10 @@
package com.bitchat.android.nostr
import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
import com.google.gson.Gson
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
import com.google.gson.JsonArray
import com.google.gson.JsonParser
import kotlinx.coroutines.*
@@ -72,11 +73,11 @@ class NostrRelayManager private constructor() {
)
// Published state
- private val _relays = MutableLiveData>()
- val relays: LiveData> = _relays
+ private val _relays = MutableStateFlow>(emptyList())
+ val relays: StateFlow> = _relays.asStateFlow()
- private val _isConnected = MutableLiveData()
- val isConnected: LiveData = _isConnected
+ private val _isConnected = MutableStateFlow(false)
+ val isConnected: StateFlow = _isConnected.asStateFlow()
// Internal state
private val relaysList = mutableListOf()
@@ -226,14 +227,14 @@ class NostrRelayManager private constructor() {
"wss://nostr21.com"
)
relaysList.addAll(defaultRelayUrls.map { Relay(it) })
- _relays.postValue(relaysList.toList())
+ _relays.value = relaysList.toList()
updateConnectionStatus()
Log.d(TAG, "✅ NostrRelayManager initialized with ${relaysList.size} default relays")
} catch (e: Exception) {
Log.e(TAG, "Failed to initialize NostrRelayManager: ${e.message}", e)
// Initialize with empty list as fallback
- _relays.postValue(emptyList())
- _isConnected.postValue(false)
+ _relays.value = emptyList()
+ _isConnected.value = false
}
}
@@ -797,12 +798,12 @@ class NostrRelayManager private constructor() {
}
private fun updateRelaysList() {
- _relays.postValue(relaysList.toList())
+ _relays.value = relaysList.toList()
}
private fun updateConnectionStatus() {
val connected = relaysList.any { it.isConnected }
- _isConnected.postValue(connected)
+ _isConnected.value = connected
}
private fun generateSubscriptionId(): String {
diff --git a/app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt b/app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt
new file mode 100644
index 00000000..d4e00104
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt
@@ -0,0 +1,67 @@
+package com.bitchat.android.service
+
+import android.app.Application
+import android.os.Process
+import androidx.core.app.NotificationManagerCompat
+import com.bitchat.android.mesh.BluetoothMeshService
+import com.bitchat.android.net.ArtiTorManager
+import com.bitchat.android.net.TorMode
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
+
+/**
+ * Coordinates a full application shutdown:
+ * - Stop mesh cleanly
+ * - Stop Tor without changing persistent setting
+ * - Clear in-memory AppState
+ * - Stop foreground service/notification
+ * - Kill the process after completion or after a 5s timeout
+ */
+object AppShutdownCoordinator {
+ private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
+
+ fun requestFullShutdownAndKill(
+ app: Application,
+ mesh: BluetoothMeshService?,
+ notificationManager: NotificationManagerCompat,
+ stopForeground: () -> Unit,
+ stopService: () -> Unit
+ ) {
+ scope.launch {
+ // Stop mesh (best-effort)
+ try { mesh?.stopServices() } catch (_: Exception) { }
+
+ // Stop Tor temporarily (do not change user setting)
+ val torProvider = ArtiTorManager.getInstance()
+ val torStop = async {
+ try { torProvider.applyMode(app, TorMode.OFF) } catch (_: Exception) { }
+ }
+
+ // Clear AppState in-memory store
+ try { com.bitchat.android.services.AppStateStore.clear() } catch (_: Exception) { }
+
+ // Stop foreground and clear notification
+ try { stopForeground() } catch (_: Exception) { }
+ try { notificationManager.cancel(10001) } catch (_: Exception) { }
+
+ // Wait up to 5 seconds for shutdown tasks
+ withTimeoutOrNull(5000) {
+ try { torStop.await() } catch (_: Exception) { }
+ delay(100)
+ }
+
+ // Stop the service itself
+ try { stopService() } catch (_: Exception) { }
+
+ // Hard kill the app process
+ try { Process.killProcess(Process.myPid()) } catch (_: Exception) { }
+ try { System.exit(0) } catch (_: Exception) { }
+ }
+ }
+}
+
diff --git a/app/src/main/java/com/bitchat/android/service/BootCompletedReceiver.kt b/app/src/main/java/com/bitchat/android/service/BootCompletedReceiver.kt
new file mode 100644
index 00000000..03a9dcd8
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/service/BootCompletedReceiver.kt
@@ -0,0 +1,16 @@
+package com.bitchat.android.service
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+class BootCompletedReceiver : BroadcastReceiver() {
+ override fun onReceive(context: Context, intent: Intent) {
+ // Ensure preferences are initialized on cold boot before reading values
+ try { MeshServicePreferences.init(context.applicationContext) } catch (_: Exception) { }
+
+ if (MeshServicePreferences.isAutoStartEnabled(true)) {
+ MeshForegroundService.start(context.applicationContext)
+ }
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt b/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt
new file mode 100644
index 00000000..7510fa06
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt
@@ -0,0 +1,324 @@
+package com.bitchat.android.service
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.bitchat.android.MainActivity
+import com.bitchat.android.R
+import com.bitchat.android.mesh.BluetoothMeshService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+
+class MeshForegroundService : Service() {
+
+ companion object {
+ private const val CHANNEL_ID = "bitchat_mesh_service"
+ private const val NOTIFICATION_ID = 10001
+
+ const val ACTION_START = "com.bitchat.android.service.START"
+ const val ACTION_STOP = "com.bitchat.android.service.STOP"
+ const val ACTION_QUIT = "com.bitchat.android.service.QUIT"
+ const val ACTION_UPDATE_NOTIFICATION = "com.bitchat.android.service.UPDATE_NOTIFICATION"
+ const val ACTION_NOTIFICATION_PERMISSION_GRANTED = "com.bitchat.android.action.NOTIFICATION_PERMISSION_GRANTED"
+
+ fun start(context: Context) {
+ val intent = Intent(context, MeshForegroundService::class.java).apply { action = ACTION_START }
+
+ // On API >= 26, avoid background-service start restrictions by using startForegroundService
+ // only when we can actually post a notification (Android 13+ requires runtime notif permission)
+ val bgEnabled = MeshServicePreferences.isBackgroundEnabled(true)
+ val hasNotifPerm = hasNotificationPermissionStatic(context)
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ if (bgEnabled && hasNotifPerm) {
+ context.startForegroundService(intent)
+ } else {
+ // Do not attempt to start a background service from headless context without notif permission
+ // or when background is disabled, to avoid BackgroundServiceStartNotAllowedException.
+ android.util.Log.i(
+ "MeshForegroundService",
+ "Not starting service on API>=26 (bgEnabled=$bgEnabled, hasNotifPerm=$hasNotifPerm)"
+ )
+ }
+ } else {
+ if (bgEnabled) {
+ context.startService(intent)
+ } else {
+ android.util.Log.i("MeshForegroundService", "Background disabled; not starting service (pre-O)")
+ }
+ }
+ }
+
+ /**
+ * Helper to be invoked right after POST_NOTIFICATIONS is granted to try
+ * promoting/starting the foreground service immediately without polling.
+ */
+ fun onNotificationPermissionGranted(context: Context) {
+ // If background is enabled and permission now granted, start/promo service
+ val hasNotifPerm = hasNotificationPermissionStatic(context)
+ if (!MeshServicePreferences.isBackgroundEnabled(true) || !hasNotifPerm) return
+
+ val intent = Intent(context, MeshForegroundService::class.java).apply { action = ACTION_UPDATE_NOTIFICATION }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ // Safe now that we can show a notification
+ context.startForegroundService(intent)
+ } else {
+ context.startService(intent)
+ }
+ }
+
+ fun stop(context: Context) {
+ val intent = Intent(context, MeshForegroundService::class.java).apply { action = ACTION_STOP }
+ context.startService(intent)
+ }
+
+ private fun shouldStartAsForeground(context: Context): Boolean {
+ return MeshServicePreferences.isBackgroundEnabled(true) &&
+ hasBluetoothPermissionsStatic(context) &&
+ hasNotificationPermissionStatic(context)
+ }
+
+ private fun hasBluetoothPermissionsStatic(ctx: Context): Boolean {
+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.BLUETOOTH_ADVERTISE) == android.content.pm.PackageManager.PERMISSION_GRANTED &&
+ androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.BLUETOOTH_CONNECT) == android.content.pm.PackageManager.PERMISSION_GRANTED &&
+ androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.BLUETOOTH_SCAN) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ } else {
+ val fine = androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.ACCESS_FINE_LOCATION) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ val coarse = androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.ACCESS_COARSE_LOCATION) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ fine || coarse
+ }
+ }
+
+ private fun hasNotificationPermissionStatic(ctx: Context): Boolean {
+ return if (Build.VERSION.SDK_INT >= 33) {
+ androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.POST_NOTIFICATIONS) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ } else true
+ }
+ }
+
+ private lateinit var notificationManager: NotificationManagerCompat
+ private var updateJob: Job? = null
+ private var meshService: BluetoothMeshService? = null
+ private val serviceJob = Job()
+ private val scope = CoroutineScope(Dispatchers.Default + serviceJob)
+ private var isInForeground: Boolean = false
+
+ override fun onCreate() {
+ super.onCreate()
+ notificationManager = NotificationManagerCompat.from(this)
+ createChannel()
+
+ // Adopt or create the mesh service
+ val existing = MeshServiceHolder.meshService
+ meshService = existing ?: MeshServiceHolder.getOrCreate(applicationContext)
+ if (existing != null) {
+ android.util.Log.d("MeshForegroundService", "Adopted existing BluetoothMeshService from holder")
+ } else {
+ android.util.Log.i("MeshForegroundService", "Created/adopted new BluetoothMeshService via holder")
+ }
+ MeshServiceHolder.attach(meshService!!)
+ }
+
+ override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+ when (intent?.action) {
+ ACTION_STOP -> {
+ // Stop FGS and mesh cleanly
+ try { meshService?.stopServices() } catch (_: Exception) { }
+ try { MeshServiceHolder.clear() } catch (_: Exception) { }
+ try { stopForeground(true) } catch (_: Exception) { }
+ notificationManager.cancel(NOTIFICATION_ID)
+ isInForeground = false
+ stopSelf()
+ return START_NOT_STICKY
+ }
+ ACTION_QUIT -> {
+ // Fully stop all background activity, stop Tor (without changing setting), then kill the app
+ AppShutdownCoordinator.requestFullShutdownAndKill(
+ app = application,
+ mesh = meshService,
+ notificationManager = notificationManager,
+ stopForeground = {
+ try { stopForeground(true) } catch (_: Exception) { }
+ isInForeground = false
+ },
+ stopService = { stopSelf() }
+ )
+ return START_NOT_STICKY
+ }
+ ACTION_UPDATE_NOTIFICATION -> {
+ // If we became eligible and are not in foreground yet, promote once
+ if (MeshServicePreferences.isBackgroundEnabled(true) && hasAllRequiredPermissions() && !isInForeground) {
+ val n = buildNotification(meshService?.getActivePeerCount() ?: 0)
+ startForeground(NOTIFICATION_ID, n)
+ isInForeground = true
+ } else {
+ updateNotification(force = true)
+ }
+ }
+ else -> { /* ACTION_START or null */ }
+ }
+
+ // Ensure mesh is running (only after permissions are granted)
+ ensureMeshStarted()
+
+ // Promote exactly once when eligible, otherwise stay background (or stop)
+ if (MeshServicePreferences.isBackgroundEnabled(true) && hasAllRequiredPermissions() && !isInForeground) {
+ val notification = buildNotification(meshService?.getActivePeerCount() ?: 0)
+ startForeground(NOTIFICATION_ID, notification)
+ isInForeground = true
+ }
+
+ // Periodically refresh the notification with live network size
+ if (updateJob == null) {
+ updateJob = scope.launch {
+ while (isActive) {
+ // Retry enabling mesh/foreground once permissions become available
+ ensureMeshStarted()
+ val eligible = MeshServicePreferences.isBackgroundEnabled(true) && hasAllRequiredPermissions()
+ if (eligible) {
+ // Only update the notification; do not re-call startForeground()
+ updateNotification(force = false)
+ } else {
+ // If disabled or perms missing, ensure we are not in foreground and clear notif
+ if (isInForeground) {
+ try { stopForeground(false) } catch (_: Exception) { }
+ isInForeground = false
+ }
+ notificationManager.cancel(NOTIFICATION_ID)
+ }
+ delay(5000)
+ }
+ }
+ }
+
+ return START_STICKY
+ }
+
+ private fun ensureMeshStarted() {
+ if (!hasBluetoothPermissions()) return
+ try {
+ android.util.Log.d("MeshForegroundService", "Ensuring mesh service is started")
+ meshService?.startServices()
+ } catch (e: Exception) {
+ android.util.Log.e("MeshForegroundService", "Failed to start mesh service: ${e.message}")
+ }
+ }
+
+ private fun updateNotification(force: Boolean) {
+ val count = meshService?.getActivePeerCount() ?: 0
+ val notification = buildNotification(count)
+ if (MeshServicePreferences.isBackgroundEnabled(true) && hasAllRequiredPermissions()) {
+ notificationManager.notify(NOTIFICATION_ID, notification)
+ } else if (force) {
+ // If disabled and forced, make sure to remove any prior foreground state
+ try { stopForeground(false) } catch (_: Exception) { }
+ notificationManager.cancel(NOTIFICATION_ID)
+ isInForeground = false
+ }
+ }
+
+ private fun hasAllRequiredPermissions(): Boolean {
+ // For starting FGS with connectedDevice|dataSync, we need:
+ // - Foreground service permissions (declared in manifest)
+ // - One of the device-related permissions (we request BL perms at runtime)
+ // - On Android 13+, POST_NOTIFICATIONS to actually show notification
+ return hasBluetoothPermissions() && hasNotificationPermission()
+ }
+
+ private fun hasBluetoothPermissions(): Boolean {
+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_ADVERTISE) == android.content.pm.PackageManager.PERMISSION_GRANTED &&
+ androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) == android.content.pm.PackageManager.PERMISSION_GRANTED &&
+ androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_SCAN) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ } else {
+ // Prior to S, scanning requires location permissions
+ val fine = androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ val coarse = androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ fine || coarse
+ }
+ }
+
+ private fun hasNotificationPermission(): Boolean {
+ return if (Build.VERSION.SDK_INT >= 33) {
+ androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) == android.content.pm.PackageManager.PERMISSION_GRANTED
+ } else true
+ }
+
+ private fun buildNotification(activeUsers: Int): Notification {
+ val openIntent = Intent(this, MainActivity::class.java)
+ val pendingIntent = PendingIntent.getActivity(
+ this, 0, openIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= 23) PendingIntent.FLAG_IMMUTABLE else 0)
+ )
+
+ // Action: Quit Bitchat
+ val quitIntent = Intent(this, MeshForegroundService::class.java).apply { action = ACTION_QUIT }
+ val quitPendingIntent = PendingIntent.getService(
+ this, 1, quitIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= 23) PendingIntent.FLAG_IMMUTABLE else 0)
+ )
+
+ val title = getString(R.string.app_name)
+ val content = getString(R.string.mesh_service_notification_content, activeUsers)
+
+ return NotificationCompat.Builder(this, CHANNEL_ID)
+ .setContentTitle(title)
+ .setContentText(content)
+ .setSmallIcon(R.mipmap.ic_launcher)
+ .setOngoing(true)
+ .setOnlyAlertOnce(true)
+ .setPriority(NotificationCompat.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_SERVICE)
+ .setContentIntent(pendingIntent)
+ // Add an action button that appears when notification is expanded
+ .addAction(
+ android.R.drawable.ic_menu_close_clear_cancel,
+ getString(R.string.notification_action_quit_bitchat),
+ quitPendingIntent
+ )
+ .build()
+ }
+
+ private fun createChannel() {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ val channel = NotificationChannel(
+ CHANNEL_ID,
+ getString(R.string.mesh_service_channel_name),
+ NotificationManager.IMPORTANCE_LOW
+ ).apply {
+ description = getString(R.string.mesh_service_channel_desc)
+ setShowBadge(false)
+ }
+ (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager)
+ .createNotificationChannel(channel)
+ }
+ }
+
+ override fun onDestroy() {
+ updateJob?.cancel()
+ updateJob = null
+ // Cancel the service coroutine scope to prevent leaks
+ try { serviceJob.cancel() } catch (_: Exception) { }
+ // Best-effort ensure we are not marked foreground
+ if (isInForeground) {
+ try { stopForeground(true) } catch (_: Exception) { }
+ isInForeground = false
+ }
+ super.onDestroy()
+ }
+
+ override fun onBind(intent: Intent?): IBinder? = null
+}
diff --git a/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt b/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt
new file mode 100644
index 00000000..d271ab29
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt
@@ -0,0 +1,60 @@
+package com.bitchat.android.service
+
+import android.content.Context
+import com.bitchat.android.mesh.BluetoothMeshService
+
+/**
+ * Process-wide holder to share a single BluetoothMeshService instance
+ * between the foreground service and UI (MainActivity/ViewModels).
+ */
+object MeshServiceHolder {
+ private const val TAG = "MeshServiceHolder"
+ @Volatile
+ var meshService: BluetoothMeshService? = null
+ private set
+
+ @Synchronized
+ fun getOrCreate(context: Context): BluetoothMeshService {
+ val existing = meshService
+ if (existing != null) {
+ // If the existing instance is healthy, reuse it; otherwise, replace it.
+ return try {
+ if (existing.isReusable()) {
+ android.util.Log.d(TAG, "Reusing existing BluetoothMeshService instance")
+ existing
+ } else {
+ android.util.Log.w(TAG, "Existing BluetoothMeshService not reusable; replacing with a fresh instance")
+ // Best-effort stop before replacing
+ try { existing.stopServices() } catch (e: Exception) {
+ android.util.Log.w(TAG, "Error while stopping non-reusable instance: ${e.message}")
+ }
+ val created = BluetoothMeshService(context.applicationContext)
+ android.util.Log.i(TAG, "Created new BluetoothMeshService (replacement)")
+ meshService = created
+ created
+ }
+ } catch (e: Exception) {
+ android.util.Log.e(TAG, "Error checking service reusability; creating new instance: ${e.message}")
+ val created = BluetoothMeshService(context.applicationContext)
+ meshService = created
+ created
+ }
+ }
+ val created = BluetoothMeshService(context.applicationContext)
+ android.util.Log.i(TAG, "Created new BluetoothMeshService (no existing instance)")
+ meshService = created
+ return created
+ }
+
+ @Synchronized
+ fun attach(service: BluetoothMeshService) {
+ android.util.Log.d(TAG, "Attaching BluetoothMeshService to holder")
+ meshService = service
+ }
+
+ @Synchronized
+ fun clear() {
+ android.util.Log.d(TAG, "Clearing BluetoothMeshService from holder")
+ meshService = null
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/service/MeshServicePreferences.kt b/app/src/main/java/com/bitchat/android/service/MeshServicePreferences.kt
new file mode 100644
index 00000000..47335ee3
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/service/MeshServicePreferences.kt
@@ -0,0 +1,32 @@
+package com.bitchat.android.service
+
+import android.content.Context
+import android.content.SharedPreferences
+
+object MeshServicePreferences {
+ private const val PREFS_NAME = "bitchat_mesh_service_prefs"
+ private const val KEY_AUTO_START = "auto_start_on_boot"
+ private const val KEY_BACKGROUND_ENABLED = "background_enabled"
+
+ private lateinit var prefs: SharedPreferences
+
+ fun init(context: Context) {
+ prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+ }
+
+ fun isAutoStartEnabled(default: Boolean = true): Boolean {
+ return prefs.getBoolean(KEY_AUTO_START, default)
+ }
+
+ fun setAutoStartEnabled(enabled: Boolean) {
+ prefs.edit().putBoolean(KEY_AUTO_START, enabled).apply()
+ }
+
+ fun isBackgroundEnabled(default: Boolean = true): Boolean {
+ return prefs.getBoolean(KEY_BACKGROUND_ENABLED, default)
+ }
+
+ fun setBackgroundEnabled(enabled: Boolean) {
+ prefs.edit().putBoolean(KEY_BACKGROUND_ENABLED, enabled).apply()
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/services/AppStateStore.kt b/app/src/main/java/com/bitchat/android/services/AppStateStore.kt
new file mode 100644
index 00000000..07f146bd
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/services/AppStateStore.kt
@@ -0,0 +1,109 @@
+package com.bitchat.android.services
+
+import com.bitchat.android.model.BitchatMessage
+import com.bitchat.android.model.DeliveryStatus
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+/**
+ * Process-wide in-memory state store that survives Activity recreation.
+ * The foreground Mesh service updates this store; UI subscribes/hydrates from it.
+ */
+object AppStateStore {
+ // Global de-dup set by message id to avoid duplicate keys in Compose lists
+ private val seenMessageIds = mutableSetOf()
+ // Connected peer IDs (mesh ephemeral IDs)
+ private val _peers = MutableStateFlow>(emptyList())
+ val peers: StateFlow> = _peers.asStateFlow()
+
+ // Public mesh timeline messages (non-channel)
+ private val _publicMessages = MutableStateFlow>(emptyList())
+ val publicMessages: StateFlow> = _publicMessages.asStateFlow()
+
+ // Private messages by peerID
+ private val _privateMessages = MutableStateFlow>>(emptyMap())
+ val privateMessages: StateFlow>> = _privateMessages.asStateFlow()
+
+ // Channel messages by channel name
+ private val _channelMessages = MutableStateFlow>>(emptyMap())
+ val channelMessages: StateFlow>> = _channelMessages.asStateFlow()
+
+ fun setPeers(ids: List) {
+ _peers.value = ids
+ }
+
+ fun addPublicMessage(msg: BitchatMessage) {
+ synchronized(this) {
+ if (seenMessageIds.contains(msg.id)) return
+ seenMessageIds.add(msg.id)
+ _publicMessages.value = _publicMessages.value + msg
+ }
+ }
+
+ fun addPrivateMessage(peerID: String, msg: BitchatMessage) {
+ synchronized(this) {
+ if (seenMessageIds.contains(msg.id)) return
+ seenMessageIds.add(msg.id)
+ val map = _privateMessages.value.toMutableMap()
+ val list = (map[peerID] ?: emptyList()) + msg
+ map[peerID] = list
+ _privateMessages.value = map
+ }
+ }
+
+ private fun statusPriority(status: DeliveryStatus?): Int = when (status) {
+ null -> 0
+ is DeliveryStatus.Sending -> 1
+ is DeliveryStatus.Sent -> 2
+ is DeliveryStatus.PartiallyDelivered -> 3
+ is DeliveryStatus.Delivered -> 4
+ is DeliveryStatus.Read -> 5
+ is DeliveryStatus.Failed -> 0
+ }
+
+ fun updatePrivateMessageStatus(messageID: String, status: DeliveryStatus) {
+ synchronized(this) {
+ val map = _privateMessages.value.toMutableMap()
+ var changed = false
+ map.keys.toList().forEach { peer ->
+ val list = map[peer]?.toMutableList() ?: mutableListOf()
+ val idx = list.indexOfFirst { it.id == messageID }
+ if (idx >= 0) {
+ val current = list[idx].deliveryStatus
+ // Do not downgrade (e.g., Read -> Delivered)
+ if (statusPriority(status) >= statusPriority(current)) {
+ list[idx] = list[idx].copy(deliveryStatus = status)
+ map[peer] = list
+ changed = true
+ }
+ }
+ }
+ if (changed) {
+ _privateMessages.value = map
+ }
+ }
+ }
+
+ fun addChannelMessage(channel: String, msg: BitchatMessage) {
+ synchronized(this) {
+ if (seenMessageIds.contains(msg.id)) return
+ seenMessageIds.add(msg.id)
+ val map = _channelMessages.value.toMutableMap()
+ val list = (map[channel] ?: emptyList()) + msg
+ map[channel] = list
+ _channelMessages.value = map
+ }
+ }
+
+ // Clear all in-memory state (used for full app shutdown)
+ fun clear() {
+ synchronized(this) {
+ seenMessageIds.clear()
+ _peers.value = emptyList()
+ _publicMessages.value = emptyList()
+ _privateMessages.value = emptyMap()
+ _channelMessages.value = emptyMap()
+ }
+ }
+}
diff --git a/app/src/main/java/com/bitchat/android/services/NicknameProvider.kt b/app/src/main/java/com/bitchat/android/services/NicknameProvider.kt
new file mode 100644
index 00000000..c7cc601f
--- /dev/null
+++ b/app/src/main/java/com/bitchat/android/services/NicknameProvider.kt
@@ -0,0 +1,21 @@
+package com.bitchat.android.services
+
+import android.content.Context
+import com.bitchat.android.ui.DataManager
+
+/**
+ * Provides current user's nickname for announcements and leave messages.
+ * If no nickname saved, falls back to the provided peerID.
+ */
+object NicknameProvider {
+ fun getNickname(context: Context, myPeerID: String): String {
+ return try {
+ val dm = DataManager(context.applicationContext)
+ val nick = dm.loadNickname()
+ if (nick.isNullOrBlank()) myPeerID else nick
+ } catch (_: Exception) {
+ myPeerID
+ }
+ }
+}
+
diff --git a/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt b/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt
index da8524cd..d931c027 100644
--- a/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt
+++ b/app/src/main/java/com/bitchat/android/ui/AboutSheet.kt
@@ -12,11 +12,15 @@ import androidx.compose.material.icons.filled.Bluetooth
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.filled.Public
-import androidx.compose.material.icons.filled.Security
import androidx.compose.material.icons.filled.Warning
+import androidx.compose.material.icons.filled.Security
+import androidx.compose.material.icons.filled.NetworkCheck
+import androidx.compose.material.icons.filled.Speed
+import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
+import kotlinx.coroutines.launch
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
@@ -29,12 +33,171 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.bitchat.android.nostr.NostrProofOfWork
import com.bitchat.android.nostr.PoWPreferenceManager
-import com.bitchat.android.ui.debug.DebugSettingsSheet
import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.bitchat.android.R
+import com.bitchat.android.core.ui.component.button.CloseButton
+import com.bitchat.android.net.TorMode
+import com.bitchat.android.net.TorPreferenceManager
+import com.bitchat.android.net.ArtiTorManager
+
/**
- * About Sheet for bitchat app information
- * Matches the design language of LocationChannelsSheet
+ * Feature row for displaying app capabilities
+ */
+@Composable
+private fun FeatureRow(
+ icon: ImageVector,
+ title: String,
+ subtitle: String
+) {
+ val colorScheme = MaterialTheme.colorScheme
+
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 14.dp),
+ verticalAlignment = Alignment.Top
+ ) {
+ Icon(
+ imageVector = icon,
+ contentDescription = null,
+ tint = colorScheme.primary,
+ modifier = Modifier
+ .padding(top = 2.dp)
+ .size(22.dp)
+ )
+ Spacer(modifier = Modifier.width(14.dp))
+ Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+ Text(
+ text = title,
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.Medium,
+ color = colorScheme.onSurface
+ )
+ Text(
+ text = subtitle,
+ style = MaterialTheme.typography.bodySmall,
+ color = colorScheme.onSurface.copy(alpha = 0.6f),
+ lineHeight = 18.sp
+ )
+ }
+ }
+}
+
+/**
+ * Theme selection chip with Apple-like styling
+ */
+@Composable
+private fun ThemeChip(
+ label: String,
+ selected: Boolean,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ val colorScheme = MaterialTheme.colorScheme
+ val isDark = colorScheme.background.red + colorScheme.background.green + colorScheme.background.blue < 1.5f
+
+ Surface(
+ modifier = modifier,
+ onClick = onClick,
+ shape = RoundedCornerShape(10.dp),
+ color = if (selected) {
+ if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D)
+ } else {
+ colorScheme.surfaceVariant.copy(alpha = 0.5f)
+ }
+ ) {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(vertical = 10.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ Text(
+ text = label,
+ style = MaterialTheme.typography.bodySmall,
+ fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Normal,
+ color = if (selected) Color.White else colorScheme.onSurface.copy(alpha = 0.8f)
+ )
+ }
+ }
+}
+
+/**
+ * Unified settings toggle row with icon, title, subtitle, and switch
+ * Apple-like design with proper spacing
+ */
+@Composable
+private fun SettingsToggleRow(
+ icon: ImageVector,
+ title: String,
+ subtitle: String,
+ checked: Boolean,
+ onCheckedChange: (Boolean) -> Unit,
+ enabled: Boolean = true,
+ statusIndicator: (@Composable () -> Unit)? = null
+) {
+ val colorScheme = MaterialTheme.colorScheme
+ val isDark = colorScheme.background.red + colorScheme.background.green + colorScheme.background.blue < 1.5f
+
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 14.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = icon,
+ contentDescription = null,
+ tint = if (enabled) colorScheme.primary else colorScheme.onSurface.copy(alpha = 0.3f),
+ modifier = Modifier.size(22.dp)
+ )
+
+ Spacer(modifier = Modifier.width(14.dp))
+
+ Column(
+ modifier = Modifier.weight(1f),
+ verticalArrangement = Arrangement.spacedBy(2.dp)
+ ) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ Text(
+ text = title,
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.Medium,
+ color = if (enabled) colorScheme.onSurface else colorScheme.onSurface.copy(alpha = 0.4f)
+ )
+ statusIndicator?.invoke()
+ }
+ Text(
+ text = subtitle,
+ style = MaterialTheme.typography.bodySmall,
+ color = colorScheme.onSurface.copy(alpha = if (enabled) 0.6f else 0.3f),
+ lineHeight = 16.sp
+ )
+ }
+
+ Spacer(modifier = Modifier.width(16.dp))
+
+ Switch(
+ checked = checked,
+ onCheckedChange = { if (enabled) onCheckedChange(it) },
+ enabled = enabled,
+ colors = SwitchDefaults.colors(
+ checkedThumbColor = Color.White,
+ checkedTrackColor = if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D),
+ uncheckedThumbColor = Color.White,
+ uncheckedTrackColor = colorScheme.surfaceVariant
+ )
+ )
+ }
+}
+
+/**
+ * Apple-like About/Settings Sheet with high-quality design
+ * Professional UX optimized for checkout scenarios
*/
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -54,8 +217,6 @@ fun AboutSheet(
"1.0.0" // fallback version
}
}
-
- // Bottom sheet state
val sheetState = rememberModalBottomSheetState(
skipPartiallyExpanded = true
@@ -68,11 +229,10 @@ fun AboutSheet(
}
}
val topBarAlpha by animateFloatAsState(
- targetValue = if (isScrolled) 0.95f else 0f,
+ targetValue = if (isScrolled) 0.98f else 0f,
label = "topBarAlpha"
)
- // Color scheme matching LocationChannelsSheet
val colorScheme = MaterialTheme.colorScheme
val isDark = colorScheme.background.red + colorScheme.background.green + colorScheme.background.blue < 1.5f
@@ -81,402 +241,368 @@ fun AboutSheet(
modifier = modifier.statusBarsPadding(),
onDismissRequest = onDismiss,
sheetState = sheetState,
- containerColor = MaterialTheme.colorScheme.background,
+ containerColor = colorScheme.background,
dragHandle = null
) {
Box(modifier = Modifier.fillMaxWidth()) {
LazyColumn(
state = lazyListState,
modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(top = 80.dp, bottom = 20.dp)
+ contentPadding = PaddingValues(top = 80.dp, bottom = 32.dp),
+ verticalArrangement = Arrangement.spacedBy(20.dp)
) {
- // Header Section
+ // Header Section - App Identity
item(key = "header") {
Column(
modifier = Modifier
.fillMaxWidth()
- .padding(horizontal = 24.dp)
- .padding(bottom = 16.dp),
- verticalArrangement = Arrangement.spacedBy(8.dp)
+ .padding(horizontal = 20.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(4.dp)
) {
- Row(
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- verticalAlignment = Alignment.Bottom
- ) {
- Text(
- text = stringResource(R.string.app_name),
- style = TextStyle(
- fontFamily = FontFamily.Monospace,
- fontWeight = FontWeight.Bold,
- fontSize = 32.sp
- ),
- color = MaterialTheme.colorScheme.onBackground
- )
-
- Text(
- text = stringResource(R.string.version_prefix, versionName?:""),
- fontSize = 11.sp,
+ Text(
+ text = stringResource(R.string.app_name),
+ style = TextStyle(
fontFamily = FontFamily.Monospace,
- color = colorScheme.onBackground.copy(alpha = 0.5f),
- style = MaterialTheme.typography.bodySmall.copy(
- baselineShift = BaselineShift(0.1f)
- )
- )
- }
-
+ fontWeight = FontWeight.Bold,
+ fontSize = 28.sp,
+ letterSpacing = 1.sp
+ ),
+ color = colorScheme.onBackground
+ )
+ Text(
+ text = stringResource(R.string.version_prefix, versionName ?: ""),
+ fontSize = 13.sp,
+ fontFamily = FontFamily.Monospace,
+ color = colorScheme.onBackground.copy(alpha = 0.5f)
+ )
Text(
text = stringResource(R.string.about_tagline),
- fontSize = 12.sp,
+ fontSize = 13.sp,
fontFamily = FontFamily.Monospace,
- color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f)
+ color = colorScheme.onBackground.copy(alpha = 0.6f),
+ modifier = Modifier.padding(top = 4.dp)
)
}
}
- // Features section
- item(key = "feature_offline") {
- Row(
- verticalAlignment = Alignment.Top,
- modifier = Modifier
- .padding(horizontal = 24.dp)
- .padding(vertical = 8.dp)
- ) {
- Icon(
- imageVector = Icons.Filled.Bluetooth,
- contentDescription = stringResource(R.string.cd_offline_mesh_chat),
- tint = MaterialTheme.colorScheme.primary,
- modifier = Modifier
- .padding(top = 2.dp)
- .size(20.dp)
+ // Features Section - Grouped Card
+ item(key = "features") {
+ Column(modifier = Modifier.padding(horizontal = 20.dp)) {
+ Text(
+ text = stringResource(R.string.about_appearance).uppercase(),
+ style = MaterialTheme.typography.labelSmall,
+ color = colorScheme.onBackground.copy(alpha = 0.5f),
+ letterSpacing = 0.5.sp,
+ modifier = Modifier.padding(start = 16.dp, bottom = 8.dp)
)
- Spacer(modifier = Modifier.width(16.dp))
- Column {
- Text(
- text = stringResource(R.string.about_offline_mesh_title),
- style = MaterialTheme.typography.titleMedium,
- fontWeight = FontWeight.Medium,
- color = MaterialTheme.colorScheme.onBackground
- )
- Spacer(modifier = Modifier.height(4.dp))
- Text(
- text = stringResource(R.string.about_offline_mesh_desc),
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f)
- )
- }
- }
- }
- item(key = "feature_geohash") {
- Row(
- verticalAlignment = Alignment.Top,
- modifier = Modifier
- .padding(horizontal = 24.dp)
- .padding(vertical = 8.dp)
- ) {
- Icon(
- imageVector = Icons.Default.Public,
- contentDescription = stringResource(R.string.cd_online_geohash_channels),
- tint = MaterialTheme.colorScheme.primary,
- modifier = Modifier
- .padding(top = 2.dp)
- .size(20.dp)
- )
- Spacer(modifier = Modifier.width(16.dp))
- Column {
- Text(
- text = stringResource(R.string.about_online_geohash_title),
- style = MaterialTheme.typography.titleMedium,
- fontWeight = FontWeight.Medium,
- color = MaterialTheme.colorScheme.onBackground
- )
- Spacer(modifier = Modifier.height(4.dp))
- Text(
- text = stringResource(R.string.about_online_geohash_desc),
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f)
- )
- }
- }
- }
- item(key = "feature_encryption") {
- Row(
- verticalAlignment = Alignment.Top,
- modifier = Modifier
- .padding(horizontal = 24.dp)
- .padding(vertical = 8.dp)
- ) {
- Icon(
- imageVector = Icons.Default.Lock,
- contentDescription = stringResource(R.string.cd_end_to_end_encryption),
- tint = MaterialTheme.colorScheme.primary,
- modifier = Modifier
- .padding(top = 2.dp)
- .size(20.dp)
- )
- Spacer(modifier = Modifier.width(16.dp))
- Column {
- Text(
- text = stringResource(R.string.about_e2e_title),
- style = MaterialTheme.typography.titleMedium,
- fontWeight = FontWeight.Medium,
- color = MaterialTheme.colorScheme.onBackground
- )
- Spacer(modifier = Modifier.height(4.dp))
- Text(
- text = stringResource(R.string.about_e2e_desc),
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f)
- )
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = colorScheme.surface,
+ shape = RoundedCornerShape(16.dp)
+ ) {
+ Column {
+ FeatureRow(
+ icon = Icons.Filled.Bluetooth,
+ title = stringResource(R.string.about_offline_mesh_title),
+ subtitle = stringResource(R.string.about_offline_mesh_desc)
+ )
+ HorizontalDivider(
+ modifier = Modifier.padding(start = 56.dp),
+ color = colorScheme.outline.copy(alpha = 0.12f)
+ )
+ FeatureRow(
+ icon = Icons.Default.Public,
+ title = stringResource(R.string.about_online_geohash_title),
+ subtitle = stringResource(R.string.about_online_geohash_desc)
+ )
+ HorizontalDivider(
+ modifier = Modifier.padding(start = 56.dp),
+ color = colorScheme.outline.copy(alpha = 0.12f)
+ )
+ FeatureRow(
+ icon = Icons.Default.Lock,
+ title = stringResource(R.string.about_e2e_title),
+ subtitle = stringResource(R.string.about_e2e_desc)
+ )
+ }
}
}
}
// Appearance Section
- item(key = "appearance_section") {
- Text(
- text = stringResource(R.string.about_appearance),
- style = MaterialTheme.typography.labelLarge,
- color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f),
- modifier = Modifier
- .padding(horizontal = 24.dp)
- .padding(top = 24.dp, bottom = 8.dp)
- )
- val themePref by com.bitchat.android.ui.theme.ThemePreferenceManager.themeFlow.collectAsState()
- Row(
- modifier = Modifier.padding(horizontal = 24.dp),
- horizontalArrangement = Arrangement.spacedBy(8.dp)
- ) {
- FilterChip(
- selected = themePref.isSystem,
- onClick = { com.bitchat.android.ui.theme.ThemePreferenceManager.set(context, com.bitchat.android.ui.theme.ThemePreference.System) },
- label = { Text(stringResource(R.string.about_system), fontFamily = FontFamily.Monospace) }
- )
- FilterChip(
- selected = themePref.isLight,
- onClick = { com.bitchat.android.ui.theme.ThemePreferenceManager.set(context, com.bitchat.android.ui.theme.ThemePreference.Light) },
- label = { Text(stringResource(R.string.about_light), fontFamily = FontFamily.Monospace) }
- )
- FilterChip(
- selected = themePref.isDark,
- onClick = { com.bitchat.android.ui.theme.ThemePreferenceManager.set(context, com.bitchat.android.ui.theme.ThemePreference.Dark) },
- label = { Text(stringResource(R.string.about_dark), fontFamily = FontFamily.Monospace) }
+ item(key = "appearance") {
+ Column(modifier = Modifier.padding(horizontal = 20.dp)) {
+ Text(
+ text = "THEME",
+ style = MaterialTheme.typography.labelSmall,
+ color = colorScheme.onBackground.copy(alpha = 0.5f),
+ letterSpacing = 0.5.sp,
+ modifier = Modifier.padding(start = 16.dp, bottom = 8.dp)
)
+ val themePref by com.bitchat.android.ui.theme.ThemePreferenceManager.themeFlow.collectAsState()
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = colorScheme.surface,
+ shape = RoundedCornerShape(16.dp)
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(12.dp),
+ horizontalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ ThemeChip(
+ label = stringResource(R.string.about_system),
+ selected = themePref.isSystem,
+ onClick = { com.bitchat.android.ui.theme.ThemePreferenceManager.set(context, com.bitchat.android.ui.theme.ThemePreference.System) },
+ modifier = Modifier.weight(1f)
+ )
+ ThemeChip(
+ label = stringResource(R.string.about_light),
+ selected = themePref.isLight,
+ onClick = { com.bitchat.android.ui.theme.ThemePreferenceManager.set(context, com.bitchat.android.ui.theme.ThemePreference.Light) },
+ modifier = Modifier.weight(1f)
+ )
+ ThemeChip(
+ label = stringResource(R.string.about_dark),
+ selected = themePref.isDark,
+ onClick = { com.bitchat.android.ui.theme.ThemePreferenceManager.set(context, com.bitchat.android.ui.theme.ThemePreference.Dark) },
+ modifier = Modifier.weight(1f)
+ )
+ }
+ }
}
}
- // Proof of Work Section
- item(key = "pow_section") {
- Text(
- text = stringResource(R.string.about_pow),
- style = MaterialTheme.typography.labelLarge,
- color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f),
- modifier = Modifier
- .padding(horizontal = 24.dp)
- .padding(top = 24.dp, bottom = 8.dp)
- )
- LaunchedEffect(Unit) {
- PoWPreferenceManager.init(context)
- }
+ // Settings Section - Unified Card with Toggles
+ item(key = "settings") {
+ LaunchedEffect(Unit) { PoWPreferenceManager.init(context) }
val powEnabled by PoWPreferenceManager.powEnabled.collectAsState()
val powDifficulty by PoWPreferenceManager.powDifficulty.collectAsState()
+ var backgroundEnabled by remember { mutableStateOf(com.bitchat.android.service.MeshServicePreferences.isBackgroundEnabled(true)) }
+ val torMode = remember { mutableStateOf(TorPreferenceManager.get(context)) }
+ val torProvider = remember { ArtiTorManager.getInstance() }
+ val torStatus by torProvider.statusFlow.collectAsState()
+ val torAvailable = remember { torProvider.isTorAvailable() }
- Column(
- modifier = Modifier.padding(horizontal = 24.dp),
- verticalArrangement = Arrangement.spacedBy(8.dp)
- ) {
- Row(
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- verticalAlignment = Alignment.CenterVertically
+ Column(modifier = Modifier.padding(horizontal = 20.dp)) {
+ Text(
+ text = "SETTINGS",
+ style = MaterialTheme.typography.labelSmall,
+ color = colorScheme.onBackground.copy(alpha = 0.5f),
+ letterSpacing = 0.5.sp,
+ modifier = Modifier.padding(start = 16.dp, bottom = 8.dp)
+ )
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = colorScheme.surface,
+ shape = RoundedCornerShape(16.dp)
) {
- FilterChip(
- selected = !powEnabled,
- onClick = { PoWPreferenceManager.setPowEnabled(false) },
- label = { Text(stringResource(R.string.about_pow_off), fontFamily = FontFamily.Monospace) }
- )
- FilterChip(
- selected = powEnabled,
- onClick = { PoWPreferenceManager.setPowEnabled(true) },
- label = {
- Row(
- horizontalArrangement = Arrangement.spacedBy(6.dp),
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text(stringResource(R.string.about_pow_on), fontFamily = FontFamily.Monospace)
- // Show current difficulty
- if (powEnabled) {
- Surface(
- color = if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D),
- shape = RoundedCornerShape(50)
- ) { Box(Modifier.size(8.dp)) }
+ Column {
+ // Background Mode Toggle
+ SettingsToggleRow(
+ icon = Icons.Filled.Bluetooth,
+ title = stringResource(R.string.about_background_title),
+ subtitle = stringResource(R.string.about_background_desc),
+ checked = backgroundEnabled,
+ onCheckedChange = { enabled ->
+ backgroundEnabled = enabled
+ com.bitchat.android.service.MeshServicePreferences.setBackgroundEnabled(enabled)
+ if (!enabled) {
+ com.bitchat.android.service.MeshForegroundService.stop(context)
+ } else {
+ com.bitchat.android.service.MeshForegroundService.start(context)
}
}
- }
- )
- }
-
- Text(
- text = stringResource(R.string.about_pow_tip),
- fontSize = 10.sp,
- fontFamily = FontFamily.Monospace,
- color = colorScheme.onSurface.copy(alpha = 0.6f)
- )
-
- // Show difficulty slider when enabled
- if (powEnabled) {
- Column(
- modifier = Modifier.fillMaxWidth(),
- verticalArrangement = Arrangement.spacedBy(8.dp)
- ) {
- Text(
- text = stringResource(R.string.about_pow_difficulty, powDifficulty, NostrProofOfWork.estimateMiningTime(powDifficulty)),
- fontSize = 11.sp,
- fontFamily = FontFamily.Monospace,
)
-
- Slider(
- value = powDifficulty.toFloat(),
- onValueChange = { PoWPreferenceManager.setPowDifficulty(it.toInt()) },
- valueRange = 0f..32f,
- steps = 33,
- colors = SliderDefaults.colors(
- thumbColor = if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D),
- activeTrackColor = if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D)
- )
+
+ HorizontalDivider(
+ modifier = Modifier.padding(start = 56.dp),
+ color = colorScheme.outline.copy(alpha = 0.12f)
+ )
+
+ // Proof of Work Toggle
+ SettingsToggleRow(
+ icon = Icons.Filled.Speed,
+ title = stringResource(R.string.about_pow),
+ subtitle = stringResource(R.string.about_pow_tip),
+ checked = powEnabled,
+ onCheckedChange = { PoWPreferenceManager.setPowEnabled(it) }
+ )
+
+ HorizontalDivider(
+ modifier = Modifier.padding(start = 56.dp),
+ color = colorScheme.outline.copy(alpha = 0.12f)
+ )
+
+ // Tor Toggle
+ SettingsToggleRow(
+ icon = Icons.Filled.Security,
+ title = "Tor Network",
+ subtitle = stringResource(R.string.about_tor_route),
+ checked = torMode.value == TorMode.ON,
+ onCheckedChange = { enabled ->
+ if (torAvailable) {
+ torMode.value = if (enabled) TorMode.ON else TorMode.OFF
+ TorPreferenceManager.set(context, torMode.value)
+ }
+ },
+ enabled = torAvailable,
+ statusIndicator = if (torMode.value == TorMode.ON) {
+ {
+ val statusColor = when {
+ torStatus.running && torStatus.bootstrapPercent >= 100 -> if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D)
+ torStatus.running -> Color(0xFFFF9500)
+ else -> Color(0xFFFF3B30)
+ }
+ Surface(
+ color = statusColor,
+ shape = CircleShape,
+ modifier = Modifier.size(8.dp)
+ ) {}
+ }
+ } else null
)
-
- // Show difficulty description
- Surface(
- modifier = Modifier.fillMaxWidth(),
- color = colorScheme.surfaceVariant.copy(alpha = 0.25f),
- shape = RoundedCornerShape(8.dp)
- ) {
- Column(
- modifier = Modifier.padding(12.dp),
- verticalArrangement = Arrangement.spacedBy(4.dp)
- ) {
- Text(
- text = stringResource(R.string.about_pow_difficulty_attempts, powDifficulty, NostrProofOfWork.estimateWork(powDifficulty)),
- fontSize = 10.sp,
- fontFamily = FontFamily.Monospace,
- color = colorScheme.onSurface.copy(alpha = 0.7f)
- )
- Text(
- text = when {
- powDifficulty == 0 -> stringResource(R.string.about_pow_desc_none)
- powDifficulty <= 8 -> stringResource(R.string.about_pow_desc_very_low)
- powDifficulty <= 12 -> stringResource(R.string.about_pow_desc_low)
- powDifficulty <= 16 -> stringResource(R.string.about_pow_desc_medium)
- powDifficulty <= 20 -> stringResource(R.string.about_pow_desc_high)
- powDifficulty <= 24 -> stringResource(R.string.about_pow_desc_very_high)
- else -> stringResource(R.string.about_pow_desc_extreme)
- },
- fontSize = 10.sp,
- fontFamily = FontFamily.Monospace,
- color = colorScheme.onSurface.copy(alpha = 0.6f)
- )
- }
- }
}
}
+
+ // Tor unavailable hint
+ if (!torAvailable) {
+ Text(
+ text = stringResource(R.string.tor_not_available_in_this_build),
+ fontSize = 12.sp,
+ fontFamily = FontFamily.Monospace,
+ color = colorScheme.onBackground.copy(alpha = 0.5f),
+ modifier = Modifier.padding(start = 16.dp, top = 8.dp)
+ )
+ }
}
}
- // Network (Tor) section
- item(key = "network_section") {
- val torMode = remember { mutableStateOf(com.bitchat.android.net.TorPreferenceManager.get(context)) }
- val torStatus by com.bitchat.android.net.TorManager.statusFlow.collectAsState()
- Text(
- text = stringResource(R.string.about_network),
- style = MaterialTheme.typography.labelLarge,
- color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.7f),
- modifier = Modifier
- .padding(horizontal = 24.dp)
- .padding(top = 24.dp, bottom = 8.dp)
- )
- Column(modifier = Modifier.padding(horizontal = 24.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
- Row(
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- verticalAlignment = Alignment.CenterVertically
- ) {
- FilterChip(
- selected = torMode.value == com.bitchat.android.net.TorMode.OFF,
- onClick = {
- torMode.value = com.bitchat.android.net.TorMode.OFF
- com.bitchat.android.net.TorPreferenceManager.set(context, torMode.value)
- },
- label = { Text("tor off", fontFamily = FontFamily.Monospace) }
- )
- FilterChip(
- selected = torMode.value == com.bitchat.android.net.TorMode.ON,
- onClick = {
- torMode.value = com.bitchat.android.net.TorMode.ON
- com.bitchat.android.net.TorPreferenceManager.set(context, torMode.value)
- },
- label = {
- Row(
- horizontalArrangement = Arrangement.spacedBy(6.dp),
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text("tor on", fontFamily = FontFamily.Monospace)
- val statusColor = when {
- torStatus.running && torStatus.bootstrapPercent < 100 -> Color(0xFFFF9500)
- torStatus.running && torStatus.bootstrapPercent >= 100 -> if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D)
- else -> Color.Red
- }
- Surface(color = statusColor, shape = CircleShape) {
- Box(Modifier.size(8.dp))
- }
- }
- }
- )
- }
- Text(
- text = stringResource(R.string.about_tor_route),
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
- )
- if (torMode.value == com.bitchat.android.net.TorMode.ON) {
- val statusText = if (torStatus.running) "Running" else "Stopped"
- // Debug status (temporary)
+ // PoW Difficulty Slider (when enabled)
+ item(key = "pow_slider") {
+ val powEnabled by PoWPreferenceManager.powEnabled.collectAsState()
+ val powDifficulty by PoWPreferenceManager.powDifficulty.collectAsState()
+
+ if (powEnabled) {
+ Column(modifier = Modifier.padding(horizontal = 20.dp)) {
Surface(
modifier = Modifier.fillMaxWidth(),
- color = colorScheme.surfaceVariant.copy(alpha = 0.25f),
- shape = RoundedCornerShape(8.dp)
+ color = colorScheme.surface,
+ shape = RoundedCornerShape(16.dp)
) {
Column(
- modifier = Modifier.padding(12.dp),
- verticalArrangement = Arrangement.spacedBy(6.dp)
+ modifier = Modifier.padding(16.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
) {
- Text(
- text = stringResource(R.string.about_tor_status, statusText, torStatus.bootstrapPercent),
- style = MaterialTheme.typography.bodySmall,
- color = colorScheme.onSurface.copy(alpha = 0.75f)
- )
- val lastLog = torStatus.lastLogLine
- if (lastLog.isNotEmpty()) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
Text(
- text = stringResource(R.string.about_last, lastLog.take(160)),
- style = MaterialTheme.typography.labelSmall,
+ text = "Difficulty",
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.Medium,
+ color = colorScheme.onSurface
+ )
+ Text(
+ text = "$powDifficulty bits • ${NostrProofOfWork.estimateMiningTime(powDifficulty)}",
+ style = MaterialTheme.typography.bodySmall,
+ fontFamily = FontFamily.Monospace,
color = colorScheme.onSurface.copy(alpha = 0.6f)
)
}
+
+ Slider(
+ value = powDifficulty.toFloat(),
+ onValueChange = { PoWPreferenceManager.setPowDifficulty(it.toInt()) },
+ valueRange = 0f..32f,
+ steps = 31,
+ colors = SliderDefaults.colors(
+ thumbColor = if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D),
+ activeTrackColor = if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D)
+ )
+ )
+
+ Text(
+ text = when {
+ powDifficulty == 0 -> stringResource(R.string.about_pow_desc_none)
+ powDifficulty <= 8 -> stringResource(R.string.about_pow_desc_very_low)
+ powDifficulty <= 12 -> stringResource(R.string.about_pow_desc_low)
+ powDifficulty <= 16 -> stringResource(R.string.about_pow_desc_medium)
+ powDifficulty <= 20 -> stringResource(R.string.about_pow_desc_high)
+ powDifficulty <= 24 -> stringResource(R.string.about_pow_desc_very_high)
+ else -> stringResource(R.string.about_pow_desc_extreme)
+ },
+ fontSize = 12.sp,
+ fontFamily = FontFamily.Monospace,
+ color = colorScheme.onSurface.copy(alpha = 0.5f)
+ )
+ }
+ }
+ }
+ }
+ }
+
+ // Tor Status (when enabled)
+ item(key = "tor_status") {
+ val torMode = remember { mutableStateOf(TorPreferenceManager.get(context)) }
+ val torProvider = remember { ArtiTorManager.getInstance() }
+ val torStatus by torProvider.statusFlow.collectAsState()
+
+ if (torMode.value == TorMode.ON) {
+ Column(modifier = Modifier.padding(horizontal = 20.dp)) {
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = colorScheme.surface,
+ shape = RoundedCornerShape(16.dp)
+ ) {
+ Column(
+ modifier = Modifier.padding(16.dp),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ val statusColor = when {
+ torStatus.running && torStatus.bootstrapPercent >= 100 -> if (isDark) Color(0xFF32D74B) else Color(0xFF248A3D)
+ torStatus.running -> Color(0xFFFF9500)
+ else -> Color(0xFFFF3B30)
+ }
+ Surface(color = statusColor, shape = CircleShape, modifier = Modifier.size(10.dp)) {}
+ Text(
+ text = if (torStatus.running) "Connected (${torStatus.bootstrapPercent}%)" else "Disconnected",
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.Medium,
+ color = colorScheme.onSurface
+ )
+ }
+ if (torStatus.lastLogLine.isNotEmpty()) {
+ Text(
+ text = torStatus.lastLogLine.take(120),
+ fontSize = 11.sp,
+ fontFamily = FontFamily.Monospace,
+ color = colorScheme.onSurface.copy(alpha = 0.5f),
+ maxLines = 2
+ )
+ }
}
}
}
}
}
- // Emergency Warning Section
- item(key = "warning_section") {
- val colorScheme = MaterialTheme.colorScheme
- val errorColor = colorScheme.error
-
+ // Emergency Warning
+ item(key = "warning") {
Surface(
modifier = Modifier
- .padding(horizontal = 24.dp, vertical = 24.dp)
+ .padding(horizontal = 20.dp)
.fillMaxWidth(),
- color = errorColor.copy(alpha = 0.1f),
- shape = RoundedCornerShape(12.dp)
+ color = colorScheme.error.copy(alpha = 0.1f),
+ shape = RoundedCornerShape(16.dp)
) {
Row(
modifier = Modifier.padding(16.dp),
@@ -485,61 +611,53 @@ fun AboutSheet(
) {
Icon(
imageVector = Icons.Filled.Warning,
- contentDescription = stringResource(R.string.cd_warning),
- tint = errorColor,
- modifier = Modifier.size(16.dp)
+ contentDescription = null,
+ tint = colorScheme.error,
+ modifier = Modifier.size(20.dp)
)
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
Text(
text = stringResource(R.string.about_emergency_title),
- fontSize = 12.sp,
- fontFamily = FontFamily.Monospace,
- fontWeight = FontWeight.Bold,
- color = errorColor
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.SemiBold,
+ color = colorScheme.error
)
Text(
text = stringResource(R.string.about_emergency_tip),
- fontSize = 11.sp,
- fontFamily = FontFamily.Monospace,
- color = colorScheme.onSurface.copy(alpha = 0.8f)
+ fontSize = 13.sp,
+ color = colorScheme.onSurface.copy(alpha = 0.7f)
)
}
}
}
}
- // Footer Section
+ // Footer
item(key = "footer") {
Column(
modifier = Modifier
- .padding(horizontal = 24.dp)
- .fillMaxWidth(),
+ .fillMaxWidth()
+ .padding(horizontal = 20.dp),
horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(8.dp)
+ verticalArrangement = Arrangement.spacedBy(12.dp)
) {
if (onShowDebug != null) {
- TextButton(
- onClick = onShowDebug,
- colors = ButtonDefaults.textButtonColors(
- contentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
- )
- ) {
+ TextButton(onClick = onShowDebug) {
Text(
text = stringResource(R.string.about_debug_settings),
- fontSize = 11.sp,
- fontFamily = FontFamily.Monospace
+ fontSize = 13.sp,
+ fontFamily = FontFamily.Monospace,
+ color = colorScheme.primary
)
}
}
Text(
text = stringResource(R.string.about_footer),
- fontSize = 11.sp,
+ fontSize = 12.sp,
fontFamily = FontFamily.Monospace,
- color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f),
+ color = colorScheme.onSurface.copy(alpha = 0.4f)
)
-
- // Add extra space at bottom for gesture area
- Spacer(modifier = Modifier.height(16.dp))
+ Spacer(modifier = Modifier.height(20.dp))
}
}
}
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
index 4b1b22ca..f741dafa 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
@@ -14,7 +14,6 @@ import androidx.compose.material.icons.filled.*
import androidx.compose.material.icons.outlined.*
import androidx.compose.material3.*
import androidx.compose.runtime.*
-import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@@ -28,9 +27,9 @@ import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.bitchat.android.core.ui.utils.singleOrTripleClickable
-import com.bitchat.android.geohash.LocationChannelManager.PermissionState
import androidx.compose.foundation.Canvas
import androidx.compose.ui.geometry.Offset
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
/**
* Header components for ChatScreen
@@ -59,7 +58,8 @@ fun isFavoriteReactive(
fun TorStatusDot(
modifier: Modifier = Modifier
) {
- val torStatus by com.bitchat.android.net.TorManager.statusFlow.collectAsState()
+ val torProvider = remember { com.bitchat.android.net.ArtiTorManager.getInstance() }
+ val torStatus by torProvider.statusFlow.collectAsState()
if (torStatus.mode != com.bitchat.android.net.TorMode.OFF) {
val dotColor = when {
@@ -248,10 +248,10 @@ fun ChatHeaderContent(
when {
selectedPrivatePeer != null -> {
// Private chat header - Fully reactive state tracking
- val favoritePeers by viewModel.favoritePeers.observeAsState(emptySet())
- val peerFingerprints by viewModel.peerFingerprints.observeAsState(emptyMap())
- val peerSessionStates by viewModel.peerSessionStates.observeAsState(emptyMap())
- val peerNicknames by viewModel.peerNicknames.observeAsState(emptyMap())
+ val favoritePeers by viewModel.favoritePeers.collectAsStateWithLifecycle()
+ val peerFingerprints by viewModel.peerFingerprints.collectAsStateWithLifecycle()
+ val peerSessionStates by viewModel.peerSessionStates.collectAsStateWithLifecycle()
+ val peerNicknames by viewModel.peerNicknames.collectAsStateWithLifecycle()
// Reactive favorite computation - no more static lookups!
val isFavorite = isFavoriteReactive(
@@ -264,8 +264,8 @@ fun ChatHeaderContent(
Log.d("ChatHeader", "Header recomposing: peer=$selectedPrivatePeer, isFav=$isFavorite, sessionState=$sessionState")
// Pass geohash context and people for NIP-17 chat title formatting
- val selectedLocationChannel by viewModel.selectedLocationChannel.observeAsState()
- val geohashPeople by viewModel.geohashPeople.observeAsState(emptyList())
+ val selectedLocationChannel by viewModel.selectedLocationChannel.collectAsStateWithLifecycle()
+ val geohashPeople by viewModel.geohashPeople.collectAsStateWithLifecycle()
PrivateChatHeader(
peerID = selectedPrivatePeer,
@@ -523,18 +523,18 @@ private fun MainHeader(
viewModel: ChatViewModel
) {
val colorScheme = MaterialTheme.colorScheme
- val connectedPeers by viewModel.connectedPeers.observeAsState(emptyList())
- val joinedChannels by viewModel.joinedChannels.observeAsState(emptySet())
- val hasUnreadChannels by viewModel.unreadChannelMessages.observeAsState(emptyMap())
- val hasUnreadPrivateMessages by viewModel.unreadPrivateMessages.observeAsState(emptySet())
- val isConnected by viewModel.isConnected.observeAsState(false)
- val selectedLocationChannel by viewModel.selectedLocationChannel.observeAsState()
- val geohashPeople by viewModel.geohashPeople.observeAsState(emptyList())
+ val connectedPeers by viewModel.connectedPeers.collectAsStateWithLifecycle()
+ val joinedChannels by viewModel.joinedChannels.collectAsStateWithLifecycle()
+ val hasUnreadChannels by viewModel.unreadChannelMessages.collectAsStateWithLifecycle()
+ val hasUnreadPrivateMessages by viewModel.unreadPrivateMessages.collectAsStateWithLifecycle()
+ val isConnected by viewModel.isConnected.collectAsStateWithLifecycle()
+ val selectedLocationChannel by viewModel.selectedLocationChannel.collectAsStateWithLifecycle()
+ val geohashPeople by viewModel.geohashPeople.collectAsStateWithLifecycle()
// Bookmarks store for current geohash toggle (iOS parity)
val context = androidx.compose.ui.platform.LocalContext.current
val bookmarksStore = remember { com.bitchat.android.geohash.GeohashBookmarksStore.getInstance(context) }
- val bookmarks by bookmarksStore.bookmarks.observeAsState(emptyList())
+ val bookmarks by bookmarksStore.bookmarks.collectAsStateWithLifecycle()
Row(
modifier = Modifier.fillMaxWidth(),
@@ -653,8 +653,8 @@ private fun LocationChannelsButton(
val colorScheme = MaterialTheme.colorScheme
// Get current channel selection from location manager
- val selectedChannel by viewModel.selectedLocationChannel.observeAsState()
- val teleported by viewModel.isTeleported.observeAsState(false)
+ val selectedChannel by viewModel.selectedLocationChannel.collectAsStateWithLifecycle()
+ val teleported by viewModel.isTeleported.collectAsStateWithLifecycle()
val (badgeText, badgeColor) = when (selectedChannel) {
is com.bitchat.android.geohash.ChannelID.Mesh -> {
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
index 6ec8bef7..d4d33ac0 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.*
import androidx.compose.foundation.layout.*
import androidx.compose.material3.*
import androidx.compose.runtime.*
-import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.Alignment
@@ -25,6 +24,7 @@ import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.zIndex
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.bitchat.android.model.BitchatMessage
import com.bitchat.android.ui.media.FullScreenImageViewer
@@ -41,22 +41,22 @@ import com.bitchat.android.ui.media.FullScreenImageViewer
@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())
- val showSidebar by viewModel.showSidebar.observeAsState(false)
- val showCommandSuggestions by viewModel.showCommandSuggestions.observeAsState(false)
- val commandSuggestions by viewModel.commandSuggestions.observeAsState(emptyList())
- val showMentionSuggestions by viewModel.showMentionSuggestions.observeAsState(false)
- val mentionSuggestions by viewModel.mentionSuggestions.observeAsState(emptyList())
- val showAppInfo by viewModel.showAppInfo.observeAsState(false)
+ val messages by viewModel.messages.collectAsStateWithLifecycle()
+ val connectedPeers by viewModel.connectedPeers.collectAsStateWithLifecycle()
+ val nickname by viewModel.nickname.collectAsStateWithLifecycle()
+ val selectedPrivatePeer by viewModel.selectedPrivateChatPeer.collectAsStateWithLifecycle()
+ val currentChannel by viewModel.currentChannel.collectAsStateWithLifecycle()
+ val joinedChannels by viewModel.joinedChannels.collectAsStateWithLifecycle()
+ val hasUnreadChannels by viewModel.unreadChannelMessages.collectAsStateWithLifecycle()
+ val hasUnreadPrivateMessages by viewModel.unreadPrivateMessages.collectAsStateWithLifecycle()
+ val privateChats by viewModel.privateChats.collectAsStateWithLifecycle()
+ val channelMessages by viewModel.channelMessages.collectAsStateWithLifecycle()
+ val showSidebar by viewModel.showSidebar.collectAsStateWithLifecycle()
+ val showCommandSuggestions by viewModel.showCommandSuggestions.collectAsStateWithLifecycle()
+ val commandSuggestions by viewModel.commandSuggestions.collectAsStateWithLifecycle()
+ val showMentionSuggestions by viewModel.showMentionSuggestions.collectAsStateWithLifecycle()
+ val mentionSuggestions by viewModel.mentionSuggestions.collectAsStateWithLifecycle()
+ val showAppInfo by viewModel.showAppInfo.collectAsStateWithLifecycle()
var messageText by remember { mutableStateOf(TextFieldValue("")) }
var showPasswordPrompt by remember { mutableStateOf(false) }
@@ -78,11 +78,11 @@ fun ChatScreen(viewModel: ChatViewModel) {
showPasswordDialog = showPasswordPrompt
}
- val isConnected by viewModel.isConnected.observeAsState(false)
- val passwordPromptChannel by viewModel.passwordPromptChannel.observeAsState(null)
+ val isConnected by viewModel.isConnected.collectAsStateWithLifecycle()
+ val passwordPromptChannel by viewModel.passwordPromptChannel.collectAsStateWithLifecycle()
// Get location channel info for timeline switching
- val selectedLocationChannel by viewModel.selectedLocationChannel.observeAsState()
+ val selectedLocationChannel by viewModel.selectedLocationChannel.collectAsStateWithLifecycle()
// Determine what messages to show based on current context (unified timelines)
val displayMessages = when {
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatState.kt b/app/src/main/java/com/bitchat/android/ui/ChatState.kt
index e17c1494..6d0f2364 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatState.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatState.kt
@@ -1,10 +1,17 @@
package com.bitchat.android.ui
import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
import com.bitchat.android.model.BitchatMessage
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
/**
* Centralized state definitions and data classes for the chat system
@@ -21,171 +28,162 @@ data class CommandSuggestion(
/**
* Contains all the observable state for the chat system
*/
-class ChatState {
+class ChatState(
+ scope: CoroutineScope
+) {
// Core messages and peer state
- private val _messages = MutableLiveData>(emptyList())
- val messages: LiveData> = _messages
+ private val _messages = MutableStateFlow>(emptyList())
+ val messages: StateFlow> = _messages.asStateFlow()
- private val _connectedPeers = MutableLiveData>(emptyList())
- val connectedPeers: LiveData> = _connectedPeers
+ private val _connectedPeers = MutableStateFlow>(emptyList())
+ val connectedPeers: StateFlow> = _connectedPeers.asStateFlow()
- private val _nickname = MutableLiveData()
- val nickname: LiveData = _nickname
+ private val _nickname = MutableStateFlow("")
+ val nickname: StateFlow = _nickname.asStateFlow()
- private val _isConnected = MutableLiveData(false)
- val isConnected: LiveData = _isConnected
+ private val _isConnected = MutableStateFlow(false)
+ val isConnected: StateFlow = _isConnected.asStateFlow()
// Private chats
- private val _privateChats = MutableLiveData>>(emptyMap())
- val privateChats: LiveData>> = _privateChats
+ private val _privateChats = MutableStateFlow>>(emptyMap())
+ val privateChats: StateFlow>> = _privateChats.asStateFlow()
- private val _selectedPrivateChatPeer = MutableLiveData(null)
- val selectedPrivateChatPeer: LiveData = _selectedPrivateChatPeer
+ private val _selectedPrivateChatPeer = MutableStateFlow(null)
+ val selectedPrivateChatPeer: StateFlow = _selectedPrivateChatPeer.asStateFlow()
- private val _unreadPrivateMessages = MutableLiveData>(emptySet())
- val unreadPrivateMessages: LiveData> = _unreadPrivateMessages
+ private val _unreadPrivateMessages = MutableStateFlow>(emptySet())
+ val unreadPrivateMessages: StateFlow> = _unreadPrivateMessages.asStateFlow()
// Channels
- private val _joinedChannels = MutableLiveData>(emptySet())
- val joinedChannels: LiveData> = _joinedChannels
+ private val _joinedChannels = MutableStateFlow>(emptySet())
+ val joinedChannels: StateFlow> = _joinedChannels.asStateFlow()
- private val _currentChannel = MutableLiveData(null)
- val currentChannel: LiveData = _currentChannel
+ private val _currentChannel = MutableStateFlow(null)
+ val currentChannel: StateFlow = _currentChannel.asStateFlow()
- private val _channelMessages = MutableLiveData>>(emptyMap())
- val channelMessages: LiveData>> = _channelMessages
+ private val _channelMessages = MutableStateFlow>>(emptyMap())
+ val channelMessages: StateFlow>> = _channelMessages.asStateFlow()
- private val _unreadChannelMessages = MutableLiveData>(emptyMap())
- val unreadChannelMessages: LiveData> = _unreadChannelMessages
+ private val _unreadChannelMessages = MutableStateFlow>(emptyMap())
+ val unreadChannelMessages: StateFlow> = _unreadChannelMessages.asStateFlow()
- private val _passwordProtectedChannels = MutableLiveData>(emptySet())
- val passwordProtectedChannels: LiveData> = _passwordProtectedChannels
+ private val _passwordProtectedChannels = MutableStateFlow>(emptySet())
+ val passwordProtectedChannels: StateFlow> = _passwordProtectedChannels.asStateFlow()
- private val _showPasswordPrompt = MutableLiveData(false)
- val showPasswordPrompt: LiveData = _showPasswordPrompt
+ private val _showPasswordPrompt = MutableStateFlow(false)
+ val showPasswordPrompt: StateFlow = _showPasswordPrompt.asStateFlow()
- private val _passwordPromptChannel = MutableLiveData(null)
- val passwordPromptChannel: LiveData = _passwordPromptChannel
+ private val _passwordPromptChannel = MutableStateFlow(null)
+ val passwordPromptChannel: StateFlow = _passwordPromptChannel.asStateFlow()
// Sidebar state
- private val _showSidebar = MutableLiveData(false)
- val showSidebar: LiveData = _showSidebar
+ private val _showSidebar = MutableStateFlow(false)
+ val showSidebar: StateFlow = _showSidebar.asStateFlow()
// Command autocomplete
- private val _showCommandSuggestions = MutableLiveData(false)
- val showCommandSuggestions: LiveData = _showCommandSuggestions
+ private val _showCommandSuggestions = MutableStateFlow(false)
+ val showCommandSuggestions: StateFlow = _showCommandSuggestions.asStateFlow()
- private val _commandSuggestions = MutableLiveData>(emptyList())
- val commandSuggestions: LiveData> = _commandSuggestions
+ private val _commandSuggestions = MutableStateFlow>(emptyList())
+ val commandSuggestions: StateFlow> = _commandSuggestions.asStateFlow()
// Mention autocomplete
- private val _showMentionSuggestions = MutableLiveData(false)
- val showMentionSuggestions: LiveData = _showMentionSuggestions
+ private val _showMentionSuggestions = MutableStateFlow(false)
+ val showMentionSuggestions: StateFlow = _showMentionSuggestions.asStateFlow()
- private val _mentionSuggestions = MutableLiveData>(emptyList())
- val mentionSuggestions: LiveData> = _mentionSuggestions
+ private val _mentionSuggestions = MutableStateFlow>(emptyList())
+ val mentionSuggestions: StateFlow> = _mentionSuggestions.asStateFlow()
// Favorites
- private val _favoritePeers = MutableLiveData>(emptySet())
- val favoritePeers: LiveData> = _favoritePeers
+ private val _favoritePeers = MutableStateFlow>(emptySet())
+ val favoritePeers: StateFlow> = _favoritePeers.asStateFlow()
// Noise session states for peers (for reactive UI updates)
- private val _peerSessionStates = MutableLiveData>(emptyMap())
- val peerSessionStates: LiveData> = _peerSessionStates
+ private val _peerSessionStates = MutableStateFlow>(emptyMap())
+ val peerSessionStates: StateFlow> = _peerSessionStates.asStateFlow()
// Peer fingerprint state for reactive favorites (for reactive UI updates)
- private val _peerFingerprints = MutableLiveData>(emptyMap())
- val peerFingerprints: LiveData> = _peerFingerprints
+ private val _peerFingerprints = MutableStateFlow>(emptyMap())
+ val peerFingerprints: StateFlow> = _peerFingerprints.asStateFlow()
- private val _peerNicknames = MutableLiveData>(emptyMap())
- val peerNicknames: LiveData> = _peerNicknames
+ private val _peerNicknames = MutableStateFlow>(emptyMap())
+ val peerNicknames: StateFlow> = _peerNicknames.asStateFlow()
- private val _peerRSSI = MutableLiveData>(emptyMap())
- val peerRSSI: LiveData> = _peerRSSI
+ private val _peerRSSI = MutableStateFlow>(emptyMap())
+ val peerRSSI: StateFlow> = _peerRSSI.asStateFlow()
// Direct connection status per peer (for live UI updates)
- private val _peerDirect = MutableLiveData>(emptyMap())
- val peerDirect: LiveData> = _peerDirect
+ private val _peerDirect = MutableStateFlow>(emptyMap())
+ val peerDirect: StateFlow> = _peerDirect.asStateFlow()
// peerIDToPublicKeyFingerprint REMOVED - fingerprints now handled centrally in PeerManager
// Navigation state
- private val _showAppInfo = MutableLiveData(false)
- val showAppInfo: LiveData = _showAppInfo
+ private val _showAppInfo = MutableStateFlow(false)
+ val showAppInfo: StateFlow = _showAppInfo.asStateFlow()
// Location channels state (for Nostr geohash features)
- private val _selectedLocationChannel = MutableLiveData(com.bitchat.android.geohash.ChannelID.Mesh)
- val selectedLocationChannel: LiveData = _selectedLocationChannel
+ private val _selectedLocationChannel = MutableStateFlow(com.bitchat.android.geohash.ChannelID.Mesh)
+ val selectedLocationChannel: StateFlow = _selectedLocationChannel.asStateFlow()
- private val _isTeleported = MutableLiveData(false)
- val isTeleported: LiveData = _isTeleported
+ private val _isTeleported = MutableStateFlow(false)
+ val isTeleported: StateFlow = _isTeleported.asStateFlow()
// Geohash people state (iOS-compatible)
- private val _geohashPeople = MutableLiveData>(emptyList())
- val geohashPeople: LiveData> = _geohashPeople
- // For background thread updates by repositories/handlers in their own scopes
- val geohashPeopleMutable: MutableLiveData> get() = _geohashPeople
+ private val _geohashPeople = MutableStateFlow>(emptyList())
+ val geohashPeople: StateFlow> = _geohashPeople.asStateFlow()
-
- private val _teleportedGeo = MutableLiveData>(emptySet())
- val teleportedGeo: LiveData> = _teleportedGeo
+ private val _teleportedGeo = MutableStateFlow>(emptySet())
+ val teleportedGeo: StateFlow> = _teleportedGeo.asStateFlow()
// Geohash participant counts reactive state (for real-time location channel counts)
- private val _geohashParticipantCounts = MutableLiveData>(emptyMap())
- val geohashParticipantCounts: LiveData> = _geohashParticipantCounts
+ private val _geohashParticipantCounts = MutableStateFlow>(emptyMap())
+ val geohashParticipantCounts: StateFlow> = _geohashParticipantCounts.asStateFlow()
- // Unread state computed properties
- val hasUnreadChannels: MediatorLiveData = MediatorLiveData()
- val hasUnreadPrivateMessages: MediatorLiveData = MediatorLiveData()
+
+ val hasUnreadChannels: StateFlow = _unreadChannelMessages
+ .map { unreadMap -> unreadMap.values.any { it > 0 } }
+ .stateIn(
+ scope = scope,
+ started = WhileSubscribed(5_000),
+ initialValue = false
+ )
- init {
- // Initialize unread state mediators
- hasUnreadChannels.addSource(_unreadChannelMessages) { unreadMap ->
- hasUnreadChannels.value = unreadMap.values.any { it > 0 }
- }
-
- hasUnreadPrivateMessages.addSource(_unreadPrivateMessages) { unreadSet ->
- hasUnreadPrivateMessages.value = unreadSet.isNotEmpty()
- }
- }
+ val hasUnreadPrivateMessages: StateFlow = _unreadPrivateMessages
+ .map { unreadSet -> unreadSet.isNotEmpty() }
+ .stateIn(
+ scope = scope,
+ started = WhileSubscribed(5_000),
+ initialValue = false
+ )
// Getters for internal state access
- fun getMessagesValue() = _messages.value ?: emptyList()
- fun getConnectedPeersValue() = _connectedPeers.value ?: emptyList()
+ fun getMessagesValue() = _messages.value
+ fun getConnectedPeersValue() = _connectedPeers.value
fun getNicknameValue() = _nickname.value
- fun getPrivateChatsValue() = _privateChats.value ?: emptyMap()
+ fun getPrivateChatsValue() = _privateChats.value
fun getSelectedPrivateChatPeerValue() = _selectedPrivateChatPeer.value
- fun getUnreadPrivateMessagesValue() = _unreadPrivateMessages.value ?: emptySet()
- fun getJoinedChannelsValue() = _joinedChannels.value ?: emptySet()
- // Thread-safe posting helpers for background updates
- fun postGeohashPeople(people: List) {
- _geohashPeople.postValue(people)
- }
-
- fun postGeohashParticipantCounts(counts: Map) {
- _geohashParticipantCounts.postValue(counts)
- }
-
-
+ fun getUnreadPrivateMessagesValue() = _unreadPrivateMessages.value
+ fun getJoinedChannelsValue() = _joinedChannels.value
fun getCurrentChannelValue() = _currentChannel.value
- fun getChannelMessagesValue() = _channelMessages.value ?: emptyMap()
- fun getUnreadChannelMessagesValue() = _unreadChannelMessages.value ?: emptyMap()
- fun getPasswordProtectedChannelsValue() = _passwordProtectedChannels.value ?: emptySet()
- fun getShowPasswordPromptValue() = _showPasswordPrompt.value ?: false
+ fun getChannelMessagesValue() = _channelMessages.value
+ fun getUnreadChannelMessagesValue() = _unreadChannelMessages.value
+ fun getPasswordProtectedChannelsValue() = _passwordProtectedChannels.value
+ fun getShowPasswordPromptValue() = _showPasswordPrompt.value
fun getPasswordPromptChannelValue() = _passwordPromptChannel.value
- fun getShowSidebarValue() = _showSidebar.value ?: false
- fun getShowCommandSuggestionsValue() = _showCommandSuggestions.value ?: false
- fun getCommandSuggestionsValue() = _commandSuggestions.value ?: emptyList()
- fun getShowMentionSuggestionsValue() = _showMentionSuggestions.value ?: false
- fun getMentionSuggestionsValue() = _mentionSuggestions.value ?: emptyList()
- fun getFavoritePeersValue() = _favoritePeers.value ?: emptySet()
- fun getPeerSessionStatesValue() = _peerSessionStates.value ?: emptyMap()
- fun getPeerFingerprintsValue() = _peerFingerprints.value ?: emptyMap()
- fun getShowAppInfoValue() = _showAppInfo.value ?: false
- fun getGeohashPeopleValue() = _geohashPeople.value ?: emptyList()
- fun getTeleportedGeoValue() = _teleportedGeo.value ?: emptySet()
- fun getGeohashParticipantCountsValue() = _geohashParticipantCounts.value ?: emptyMap()
+ fun getShowSidebarValue() = _showSidebar.value
+ fun getShowCommandSuggestionsValue() = _showCommandSuggestions.value
+ fun getCommandSuggestionsValue() = _commandSuggestions.value
+ fun getShowMentionSuggestionsValue() = _showMentionSuggestions.value
+ fun getMentionSuggestionsValue() = _mentionSuggestions.value
+ fun getFavoritePeersValue() = _favoritePeers.value
+ fun getPeerSessionStatesValue() = _peerSessionStates.value
+ fun getPeerFingerprintsValue() = _peerFingerprints.value
+ fun getShowAppInfoValue() = _showAppInfo.value
+ fun getGeohashPeopleValue() = _geohashPeople.value
+ fun getTeleportedGeoValue() = _teleportedGeo.value
+ fun getGeohashParticipantCountsValue() = _geohashParticipantCounts.value
// Setters for state updates
fun setMessages(messages: List) {
@@ -197,7 +195,7 @@ class ChatState {
}
fun postTeleportedGeo(teleported: Set) {
- _teleportedGeo.postValue(teleported)
+ _teleportedGeo.value = teleported
}
fun setNickname(nickname: String) {
@@ -269,7 +267,7 @@ class ChatState {
}
fun setFavoritePeers(favorites: Set) {
- val currentValue = _favoritePeers.value ?: emptySet()
+ val currentValue = _favoritePeers.value
Log.d("ChatState", "setFavoritePeers called with ${favorites.size} favorites: $favorites")
Log.d("ChatState", "Current value: $currentValue")
Log.d("ChatState", "Values equal: ${currentValue == favorites}")
@@ -278,8 +276,7 @@ class ChatState {
// Always set the value - even if equal, this ensures observers are triggered
_favoritePeers.value = favorites
- Log.d("ChatState", "LiveData value after set: ${_favoritePeers.value}")
- Log.d("ChatState", "LiveData has active observers: ${_favoritePeers.hasActiveObservers()}")
+ Log.d("ChatState", "StateFlow value after set: ${_favoritePeers.value}")
}
fun setPeerSessionStates(states: Map) {
diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
index 74ab15c6..1196396d 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
@@ -4,8 +4,8 @@ import android.app.Application
import android.util.Log
import androidx.core.app.NotificationManagerCompat
import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.StateFlow
import com.bitchat.android.mesh.BluetoothMeshDelegate
import com.bitchat.android.mesh.BluetoothMeshService
import com.bitchat.android.model.BitchatMessage
@@ -47,7 +47,9 @@ class ChatViewModel(
}
// MARK: - State management
- private val state = ChatState()
+ private val state = ChatState(
+ scope = viewModelScope,
+ )
// Transfer progress tracking
private val transferMessageMap = mutableMapOf()
@@ -103,44 +105,79 @@ class ChatViewModel(
- // Expose state through LiveData (maintaining the same interface)
- val messages: LiveData> = state.messages
- val connectedPeers: LiveData> = state.connectedPeers
- val nickname: LiveData = state.nickname
- val isConnected: LiveData = state.isConnected
- val privateChats: LiveData>> = state.privateChats
- val selectedPrivateChatPeer: LiveData = state.selectedPrivateChatPeer
- val unreadPrivateMessages: LiveData> = state.unreadPrivateMessages
- val joinedChannels: LiveData> = state.joinedChannels
- val currentChannel: LiveData = state.currentChannel
- val channelMessages: LiveData>> = state.channelMessages
- val unreadChannelMessages: LiveData> = state.unreadChannelMessages
- val passwordProtectedChannels: LiveData> = state.passwordProtectedChannels
- val showPasswordPrompt: LiveData = state.showPasswordPrompt
- val passwordPromptChannel: LiveData = state.passwordPromptChannel
- val showSidebar: LiveData = state.showSidebar
+
+ val messages: StateFlow> = state.messages
+ val connectedPeers: StateFlow> = state.connectedPeers
+ val nickname: StateFlow = state.nickname
+ val isConnected: StateFlow = state.isConnected
+ val privateChats: StateFlow>> = state.privateChats
+ val selectedPrivateChatPeer: StateFlow = state.selectedPrivateChatPeer
+ val unreadPrivateMessages: StateFlow> = state.unreadPrivateMessages
+ val joinedChannels: StateFlow> = state.joinedChannels
+ val currentChannel: StateFlow = state.currentChannel
+ val channelMessages: StateFlow>> = state.channelMessages
+ val unreadChannelMessages: StateFlow> = state.unreadChannelMessages
+ val passwordProtectedChannels: StateFlow> = state.passwordProtectedChannels
+ val showPasswordPrompt: StateFlow = state.showPasswordPrompt
+ val passwordPromptChannel: StateFlow = state.passwordPromptChannel
+ val showSidebar: StateFlow = state.showSidebar
val hasUnreadChannels = state.hasUnreadChannels
val hasUnreadPrivateMessages = state.hasUnreadPrivateMessages
- val showCommandSuggestions: LiveData = state.showCommandSuggestions
- val commandSuggestions: LiveData> = state.commandSuggestions
- val showMentionSuggestions: LiveData = state.showMentionSuggestions
- val mentionSuggestions: LiveData> = state.mentionSuggestions
- val favoritePeers: LiveData