mirror of
https://github.com/permissionlesstech/bitchat-android.git
synced 2026-08-08 06:46:11 +00:00
1eb98de4c0
# Conflicts: # .github/workflows/android-build.yml # .github/workflows/release.yml # app/proguard-rules.pro # app/src/main/java/com/bitchat/android/favorites/FavoritesPersistenceService.kt # app/src/main/java/com/bitchat/android/nostr/NostrDirectMessageHandler.kt # app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt # app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt # app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt # app/src/main/java/com/bitchat/android/services/AppStateStore.kt # app/src/main/java/com/bitchat/android/services/SeenMessageStore.kt # app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt # app/src/main/java/com/bitchat/android/ui/GeohashViewModel.kt # app/src/main/java/com/bitchat/android/ui/MessageManager.kt # app/src/test/kotlin/com/bitchat/android/nostr/NostrDirectMessageHandlerTest.kt # app/src/test/kotlin/com/bitchat/android/services/AppStateStoreTest.kt