permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-26 01:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Geohash notifications (#288)

Browse Source 
* mention notifications

* notifications

* warning
This commit is contained in:
callebtc
2025-08-23 01:35:46 +02:00
committed by GitHub
parent 65afdfb92e
commit f13f3063c9
6 changed files with 646 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/MainActivity.kt
+45 -11
View File
@@ -658,7 +658,7 @@ class MainActivity : ComponentActivity() {
}
/**
* Handle intents from notification clicks - open specific private chat
* Handle intents from notification clicks - open specific private chat or geohash chat
*/
private fun handleNotificationIntent(intent: Intent) {
val shouldOpenPrivateChat = intent.getBooleanExtra(
@@ -666,18 +666,52 @@ class MainActivity : ComponentActivity() {
false
)
if (shouldOpenPrivateChat) {
val peerID = intent.getStringExtra(com.bitchat.android.ui.NotificationManager.EXTRA_PEER_ID)
val senderNickname = intent.getStringExtra(com.bitchat.android.ui.NotificationManager.EXTRA_SENDER_NICKNAME)
val shouldOpenGeohashChat = intent.getBooleanExtra(
com.bitchat.android.ui.NotificationManager.EXTRA_OPEN_GEOHASH_CHAT,
false
)
when {
shouldOpenPrivateChat -> {
val peerID = intent.getStringExtra(com.bitchat.android.ui.NotificationManager.EXTRA_PEER_ID)
val senderNickname = intent.getStringExtra(com.bitchat.android.ui.NotificationManager.EXTRA_SENDER_NICKNAME)
if (peerID != null) {
Log.d("MainActivity", "Opening private chat with $senderNickname (peerID: $peerID) from notification")
// Open the private chat with this peer
chatViewModel.startPrivateChat(peerID)
// Clear notifications for this sender since user is now viewing the chat
chatViewModel.clearNotificationsForSender(peerID)
}
}
if (peerID != null) {
Log.d("MainActivity", "Opening private chat with $senderNickname (peerID: $peerID) from notification")
shouldOpenGeohashChat -> {
val geohash = intent.getStringExtra(com.bitchat.android.ui.NotificationManager.EXTRA_GEOHASH)
// Open the private chat with this peer
chatViewModel.startPrivateChat(peerID)
// Clear notifications for this sender since user is now viewing the chat
chatViewModel.clearNotificationsForSender(peerID)
if (geohash != null) {
Log.d("MainActivity", "Opening geohash chat #$geohash from notification")
// Switch to the geohash channel - create appropriate geohash channel level
val level = when (geohash.length) {
7 -> com.bitchat.android.geohash.GeohashChannelLevel.BLOCK
6 -> com.bitchat.android.geohash.GeohashChannelLevel.NEIGHBORHOOD
5 -> com.bitchat.android.geohash.GeohashChannelLevel.CITY
4 -> com.bitchat.android.geohash.GeohashChannelLevel.REGION
2 -> com.bitchat.android.geohash.GeohashChannelLevel.COUNTRY
else -> com.bitchat.android.geohash.GeohashChannelLevel.CITY // Default fallback
}
val geohashChannel = com.bitchat.android.geohash.GeohashChannel(level, geohash)
val channelId = com.bitchat.android.geohash.ChannelID.Location(geohashChannel)
chatViewModel.selectLocationChannel(channelId)
// Update current geohash state for notifications
chatViewModel.setCurrentGeohash(geohash)
// Clear notifications for this geohash since user is now viewing it
chatViewModel.clearNotificationsForGeohash(geohash)
}
}
}
}