CC 3ac6976a54 Merge branch 'main' into wifi-aware-refactor-mesh-core ...

# 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

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

..

debug

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

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

events

Media transfers (#440)

2025-09-19 22:46:14 +02:00

media

Revert "voice note player ui (#680)" (#690)

2026-03-30 10:21:38 +02:00

theme

Revert "voice note player ui (#680)" (#690)

2026-03-30 10:21:38 +02:00

AboutSheet.kt

UI Refactor (#562)

2026-01-12 15:29:09 +07:00

ChannelManager.kt

Changes bitchat protocol (#265)

2025-08-18 21:16:27 +02:00

ChatHeader.kt

Move PrivateChatSheet hosting into ChatDialogs and unify sheet state (#586)

2026-01-14 17:12:40 +07:00

ChatScreen.kt

Move PrivateChatSheet hosting into ChatDialogs and unify sheet state (#586)

2026-01-14 17:12:40 +07:00

ChatState.kt

Move PrivateChatSheet hosting into ChatDialogs and unify sheet state (#586)

2026-01-14 17:12:40 +07:00

ChatUIConstants.kt

Extract constants (#469)

2025-10-12 20:59:37 +02:00

ChatUIUtils.kt

Media transfers (#440)

2025-09-19 22:46:14 +02:00

ChatUserSheet.kt

Add 'Send private message' action to chat user sheet (#649)

2026-03-25 14:45:36 +01:00

ChatViewModel.kt

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

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

ChatViewModelUtils.kt

REFACTOR STEP 2: Extract mesh delegate handling to separate class

2025-07-09 00:44:53 +02:00

CommandProcessor.kt

Nostr refactor simplify (#390)

2025-09-08 13:46:15 +02:00

DataManager.kt

restore default (#348)

2025-08-29 22:11:05 +02:00

GeohashPeopleList.kt

Migrate from LiveData to Kotlin Flow (#518)

2025-12-13 15:58:48 +07:00

GeohashPickerActivity.kt

feat: Add tablet landscape orientation support (#490)

2025-10-20 20:14:50 +02:00

GeohashViewModel.kt

Add 'Send private message' action to chat user sheet (#649)

2026-03-25 14:45:36 +01:00

InputComponents.kt

Revert "update input button styling (#682)" (#689)

2026-03-30 10:20:25 +02:00

LinkPreviewPill.kt

Translations (#467)

2025-10-12 18:54:20 +02:00

LocationChannelsSheet.kt

fix(geohash): cleanup sampling subscriptions when closing location sheet (#659)

2026-01-31 16:42:20 +01:00

LocationNotesButton.kt

Fix and Improve LocationManager logic (#599)

2026-01-15 11:11:56 +07:00

LocationNotesSheet.kt

Fix location update in notes sheet and Nostr subscription leaks (#636)

2026-01-17 00:47:53 +07:00

LocationNotesSheetPresenter.kt

Refactored BottomSheetTopBar to BitchatSheetTopBar (#601)

2026-01-16 01:00:04 +07:00

MatrixEncryptionAnimation.kt

Migrate from LiveData to Kotlin Flow (#518)

2025-12-13 15:58:48 +07:00

MediaSendingManager.kt

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

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

MeshDelegateHandler.kt

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

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

MeshPeerListSheet.kt

Refactored BottomSheetTopBar to BitchatSheetTopBar (#601)

2026-01-16 01:00:04 +07:00

MessageComponents.kt

Fix scroll bug(#568) (#570)

2026-01-12 14:43:28 +07:00

MessageManager.kt

Fix wifi aware socket binding 2 (#536)

2026-01-03 23:39:54 +07:00

MessageSpecialParser.kt

render links normally (#331)

2025-08-29 00:40:25 +02:00

NotificationManager.kt

QR and Verification feature (#529)

2026-01-04 16:29:07 +07:00

NotificationTextUtils.kt

Media transfers (#440)

2025-09-19 22:46:14 +02:00

OrientationAwareActivity.kt

feat: Add tablet landscape orientation support (#490)

2025-10-20 20:14:50 +02:00

PoWStatusIndicator.kt

Migrate from LiveData to Kotlin Flow (#518)

2025-12-13 15:58:48 +07:00

PrivateChatManager.kt

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

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

SecurityVerificationSheet.kt

UI Refactor (#562)

2026-01-12 15:29:09 +07:00

VerificationHandler.kt

fix(security): Clear in-memory keys during panic mode (#596)

2026-01-15 15:11:10 +07:00

VerificationSheet.kt

improve verification sheet (#615)

2026-01-15 15:11:36 +07:00

VoiceInputComponents.kt

Revert "update input button styling (#682)" (#689)

2026-03-30 10:20:25 +02:00