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

works

Browse Source
This commit is contained in:
callebtc
2025-10-17 22:25:13 +02:00
parent 4d509ffda5
commit 6879906b71
3 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/MainActivity.kt
+24 -16
View File
@@ -602,16 +602,24 @@ class MainActivity : ComponentActivity() {
com.bitchat.android.nostr.LocationNotesCounter.initialize(
relayManager = { com.bitchat.android.nostr.NostrRelayManager.getInstance(this@MainActivity) },
subscribe = { filter, id, handler ->
// Use subscribeForGeohash for location notes (finds geo-local relays)
val geohashFromFilter = filter.getDebugDescription().substringAfter("#g=").substringBefore(")").substringBefore(",")
com.bitchat.android.nostr.NostrRelayManager.getInstance(this@MainActivity).subscribeForGeohash(
geohash = geohashFromFilter,
filter = filter,
id = id,
handler = handler,
includeDefaults = true,
nRelays = 5
)
// CRITICAL FIX: Extract geohash properly from filter (not from debug string!)
val geohashFromFilter = filter.getGeohash() ?: run {
Log.e("MainActivity", "Cannot extract geohash from filter for location notes counter")
""
}
if (geohashFromFilter.isNotEmpty()) {
com.bitchat.android.nostr.NostrRelayManager.getInstance(this@MainActivity).subscribeForGeohash(
geohash = geohashFromFilter,
filter = filter,
id = id,
handler = handler,
includeDefaults = true,
nRelays = 5
)
} else {
id
}
},
unsubscribe = { id ->
com.bitchat.android.nostr.NostrRelayManager.getInstance(this@MainActivity).unsubscribe(id)
@@ -623,13 +631,13 @@ class MainActivity : ComponentActivity() {
com.bitchat.android.nostr.LocationNotesManager.getInstance().initialize(
relayManager = { com.bitchat.android.nostr.NostrRelayManager.getInstance(this@MainActivity) },
subscribe = { filter, id, handler ->
// Extract geohash from filter for geo-routing
val geohashFromFilter = filter.getDebugDescription()
.substringAfter("#g=")
.substringBefore(")")
.substringBefore(",")
// CRITICAL FIX: Extract geohash properly from filter using getGeohash() method
val geohashFromFilter = filter.getGeohash() ?: run {
Log.e("MainActivity", "❌ Cannot extract geohash from filter for location notes")
return@initialize id // Return subscription ID even on error
}
Log.d("MainActivity", "Location Notes subscribing to geohash: $geohashFromFilter")
Log.d("MainActivity", "📍 Location Notes subscribing to geohash: $geohashFromFilter")
com.bitchat.android.nostr.NostrRelayManager.getInstance(this@MainActivity).subscribeForGeohash(
geohash = geohashFromFilter,