Merge branch 'main' into wifi-aware-refactor-mesh-core

Browse Source

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/bitchat/android/BitchatApplication.kt
#	app/src/main/java/com/bitchat/android/MainActivity.kt
#	app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionTracker.kt
#	app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
#	app/src/main/java/com/bitchat/android/noise/NoiseEncryptionService.kt
#	app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt
#	app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt

...

This commit is contained in:

CC

2026-06-08 22:56:40 +02:00

parent 689f3db1f9 054887bad8

commit 3ac6976a54

146 changed files with 12976 additions and 2773 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt

+1108 -248

File diff suppressed because it is too large Load Diff