From 2a11d52d3c0c19391ab5b45444959dd6216f18fb Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 14 Dec 2025 06:06:53 +0000 Subject: [PATCH 01/10] Automated update of relay data - Sun Dec 14 06:06:53 UTC 2025 --- app/src/main/assets/nostr_relays.csv | 549 ++++++++++++++------------- 1 file changed, 282 insertions(+), 267 deletions(-) diff --git a/app/src/main/assets/nostr_relays.csv b/app/src/main/assets/nostr_relays.csv index 2c07fe69..2288010a 100644 --- a/app/src/main/assets/nostr_relays.csv +++ b/app/src/main/assets/nostr_relays.csv @@ -1,270 +1,285 @@ Relay URL,Latitude,Longitude -relay02.lnfi.network,39.0997,-94.5786 -srtrelay.c-stellar.net,43.6532,-79.3832 -alienos.libretechsystems.xyz,55.4724,9.87335 -relay.uid.ovh,43.6532,-79.3832 -relay.cypherflow.ai,48.8566,2.35222 -wot.tealeaf.dev,33.7488,-84.3877 -relay.divine.video,43.6532,-79.3832 -relay.tagayasu.xyz,43.6715,-79.38 -nostr.camalolo.com,24.1469,120.684 -wot.sudocarlos.com,51.5072,-0.127586 -nostr.vulpem.com,49.4543,11.0746 -relay2.angor.io,48.1046,11.6002 -relay.nostr.nisshiee.org,37.3387,-121.885 -wot.nostr.party,36.1627,-86.7816 -nostr.luisschwab.net,43.6532,-79.3832 -cyberspace.nostr1.com,40.7128,-74.006 -strfry.felixzieger.de,50.1013,8.62643 -relay.agora.social,50.7383,15.0648 -nostr.n7ekb.net,47.4941,-122.294 -relay.bitcoinveneto.org,64.1466,-21.9426 -relay.stream.labs.h3.se,59.4016,17.9455 -nostr.azzamo.net,52.2633,21.0283 -relay.nostrhub.tech,49.0291,8.35696 -relay.21e6.cz,50.7383,15.0648 -nostr-02.czas.top,51.2277,6.77346 -nostr.czas.top,50.1109,8.68213 -wot.nostr.place,32.7767,-96.797 -strfry.shock.network,39.0438,-77.4874 -relay.orangepill.ovh,49.1689,-0.358841 -relay.illuminodes.com,47.6061,-122.333 -bcast.girino.org,43.6532,-79.3832 -nostr.stakey.net,52.3676,4.90414 -nostr.lkjsxc.com,43.6532,-79.3832 -nostr.coincrowd.fund,39.0438,-77.4874 -relay.damus.io,43.6532,-79.3832 -nostr.myshosholoza.co.za,52.3676,4.90414 -nostr.88mph.life,60.1699,24.9384 -relay.sharegap.net,43.6532,-79.3832 -purplerelay.com,50.1109,8.68213 -ribo.us.nostria.app,41.5868,-93.625 -nostr.snowbla.de,60.1699,24.9384 -relay.internationalright-wing.org,-22.5986,-48.8003 -relay.btcforplebs.com,43.6532,-79.3832 -nostr.red5d.dev,43.6532,-79.3832 -orangepiller.org,60.1699,24.9384 -relay.nosto.re,51.1792,5.89444 -relay04.lnfi.network,39.0997,-94.5786 -nostr.now,36.55,139.733 -relay.binaryrobot.com,43.6532,-79.3832 -premium.primal.net,43.6532,-79.3832 -relay.davidebtc.me,51.5072,-0.127586 -purpura.cloud,43.6532,-79.3832 -nostr.mikoshi.de,50.1109,8.68213 -nostr.simplex.icu,51.5121,-0.0005238 -articles.layer3.news,37.3387,-121.885 -nostr.spicyz.io,43.6532,-79.3832 -nostrcheck.me,43.6532,-79.3832 -relay.holzeis.me,43.6532,-79.3832 -nostr-01.uid.ovh,43.6532,-79.3832 -relay.nostar.org,43.6532,-79.3832 -soloco.nl,43.6532,-79.3832 -nostr.thebiglake.org,32.71,-96.6745 -relay.nostr-check.me,43.6532,-79.3832 -nproxy.kristapsk.lv,60.1699,24.9384 -relay-freeharmonypeople.space,38.7223,-9.13934 -nostrelay.memory-art.xyz,43.6532,-79.3832 -orangesync.tech,50.1109,8.68213 -nostr.data.haus,50.4754,12.3683 -vitor.nostr1.com,40.7057,-74.0136 -nostr.overmind.lol,43.6532,-79.3832 -nostr-relay.online,43.6532,-79.3832 -relay.bitcoindistrict.org,43.6532,-79.3832 -relay.javi.space,43.4633,11.8796 -fanfares.nostr1.com,40.7057,-74.0136 -temp.iris.to,43.6532,-79.3832 -relay.guggero.org,47.3769,8.54169 -relay.degmods.com,50.4754,12.3683 -relay.nostr.net,43.6532,-79.3832 -relay.wolfcoil.com,35.6092,139.73 -relay.sigit.io,50.4754,12.3683 -shu04.shugur.net,25.2604,55.2989 -nostr.rtvslawenia.com,49.4543,11.0746 -nostr.kalf.org,52.3676,4.90414 -relay-testnet.k8s.layer3.news,37.3387,-121.885 -nostr.rblb.it,43.7094,10.6582 -nostr.ovia.to,43.6532,-79.3832 -nostr-relay.nextblockvending.com,47.2343,-119.853 -relay.agorist.space,52.3734,4.89406 -relay.jeffg.fyi,43.6532,-79.3832 -relay.ditto.pub,43.6532,-79.3832 -nostr.huszonegy.world,47.4979,19.0402 -nostr.coincards.com,53.5501,-113.469 -nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 -nostream.breadslice.com,1.35208,103.82 -ribo.eu.nostria.app,52.3676,4.90414 -nostr.oxtr.dev,50.4754,12.3683 -nostr.jerrynya.fun,31.2304,121.474 -black.nostrcity.club,48.8575,2.35138 -wheat.happytavern.co,43.6532,-79.3832 -nostr-relay.psfoundation.info,39.0438,-77.4874 -relay.zone667.com,60.1699,24.9384 -theoutpost.life,64.1476,-21.9392 -nostrelay.circum.space,52.3676,4.90414 -relay.origin.land,35.6673,139.751 -relay.lumina.rocks,49.0291,8.35695 -relay.chorus.community,50.1109,8.68213 -kotukonostr.onrender.com,37.7775,-122.397 -nostrcheck.tnsor.network,43.6532,-79.3832 -relay01.lnfi.network,39.0997,-94.5786 -bitsat.molonlabe.holdings,51.4012,-1.3147 -relay.nsnip.io,60.1699,24.9384 -nostr.mehdibekhtaoui.com,49.4939,-1.54813 -relay.ru.ac.th,13.7607,100.627 -relay.thibautduchene.fr,43.6532,-79.3832 -nos.xmark.cc,50.6924,3.20113 -wot.dtonon.com,43.6532,-79.3832 -relay.satmaxt.xyz,43.6532,-79.3832 -wot.brightbolt.net,47.6735,-116.781 -nostr.bond,50.1109,8.68213 -relay.vrtmrz.net,43.6532,-79.3832 -dev-relay.lnfi.network,39.0997,-94.5786 -wot.sebastix.social,51.1792,5.89444 -nostr.hifish.org,47.4043,8.57398 -divine.diy,43.6532,-79.3832 -bitcoiner.social,39.1585,-94.5728 -relay.islandbitcoin.com,12.8498,77.6545 -nostr-2.21crypto.ch,47.5356,8.73209 -relay.snort.social,53.3498,-6.26031 -shu05.shugur.net,48.8566,2.35222 -relay.nostrcheck.me,43.6532,-79.3832 -relay.0xchat.com,1.35208,103.82 -relay.dwadziesciajeden.pl,52.2297,21.0122 -relay.getsafebox.app,43.6532,-79.3832 -relay.moinsen.com,50.4754,12.3683 -relay.primal.net,43.6532,-79.3832 -relay.npubhaus.com,43.6532,-79.3832 -nostr.tuckerbradford.com,43.663,-70.2569 -nostr.rikmeijer.nl,50.4754,12.3683 -nostr.agentcampfire.com,52.3676,4.90414 -shu02.shugur.net,21.4902,39.2246 -librerelay.aaroniumii.com,43.6532,-79.3832 -fenrir-s.notoshi.win,43.6532,-79.3832 -relayrs.notoshi.win,43.6532,-79.3832 -nostr.girino.org,43.6532,-79.3832 -ribo.af.nostria.app,-26.2056,28.0337 -relay.bitcoinartclock.com,50.4754,12.3683 -relay.nostrdice.com,-33.8688,151.209 -strfry.elswa-dev.online,50.1109,8.68213 -nostr.21crypto.ch,47.5356,8.73209 -wot.shaving.kiwi,43.6532,-79.3832 -nostr.mom,50.4754,12.3683 -relay.lightning.pub,39.0438,-77.4874 -nostr-02.yakihonne.com,1.32123,103.695 -relay.mccormick.cx,52.3563,4.95714 -ynostr.yael.at,60.1699,24.9384 -nostr.faultables.net,43.6532,-79.3832 -prl.plus,56.9677,24.1056 -santo.iguanatech.net,40.8302,-74.1299 -nostr.bitcoiner.social,39.1585,-94.5728 -nostr-relay.corb.net,38.8353,-104.822 -relay.letsfo.com,51.098,17.0321 -nostr.calitabby.net,39.9268,-75.0246 -strfry.bonsai.com,37.8715,-122.273 -wot.nostr.net,43.6532,-79.3832 -bcast.seutoba.com.br,43.6532,-79.3832 -wot.sovbit.host,64.1466,-21.9426 -relay2.ngengine.org,43.6532,-79.3832 -r.bitcoinhold.net,43.6532,-79.3832 -ithurtswhenip.ee,51.223,6.78245 -freeben666.fr,43.7221,7.15296 -relay.notoshi.win,13.311,101.112 -yabu.me,35.6092,139.73 -dev-nostr.bityacht.io,25.0797,121.234 -nostr.commonshub.brussels,49.4543,11.0746 -relay.nostx.io,43.6532,-79.3832 -relay.nostr.band,60.1699,24.9384 -relay.barine.co,43.6532,-79.3832 -relay.arx-ccn.com,50.4754,12.3683 -satsage.xyz,37.3986,-121.964 -relay.nostr.wirednet.jp,34.706,135.493 -relay.artx.market,43.652,-79.3633 -nostr2.girino.org,43.6532,-79.3832 -nostr.tadryanom.me,43.6532,-79.3832 -relay.satlantis.io,32.8769,-80.0114 -nostr.zoracle.org,45.6018,-121.185 -nostr.bilthon.dev,25.8128,-80.2377 -relay.minibolt.info,43.6532,-79.3832 -relay.chakany.systems,43.6532,-79.3832 -nostr.spaceshell.xyz,43.6532,-79.3832 -nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 -offchain.pub,47.6743,-117.112 -shu01.shugur.net,21.4902,39.2246 -nostr-relay.xbytez.io,50.6924,3.20113 -nostr.noones.com,50.1109,8.68213 -relay.nostriot.com,41.5695,-83.9786 -nostr-relay.zimage.com,34.0549,-118.243 -relay.siamdev.cc,13.9178,100.424 -nostr.4rs.nl,49.0291,8.35696 -relay.coinos.io,43.6532,-79.3832 -khatru.nostrver.se,51.1792,5.89444 -x.kojira.io,43.6532,-79.3832 -wot.yesnostr.net,50.9871,2.12554 -nostr.casa21.space,43.6532,-79.3832 -nos.lol,50.4754,12.3683 -relay.mattybs.lol,43.6532,-79.3832 -nostr-01.yakihonne.com,1.32123,103.695 -nostr.tac.lol,47.4748,-122.273 -relay.nuts.cash,34.0362,-118.443 -relay.cosmicbolt.net,37.3986,-121.964 -nostr.diakod.com,43.6532,-79.3832 -relay.mostro.network,40.8302,-74.1299 -relay.fr13nd5.com,52.5233,13.3426 -relay.trustroots.org,43.6532,-79.3832 -relay.thebluepulse.com,49.4521,11.0767 -relay.wavefunc.live,34.0362,-118.443 -relay.wavlake.com,41.2619,-95.8608 -relay.libernet.app,43.6532,-79.3832 -nostr-relay.cbrx.io,43.6532,-79.3832 -relay.fountain.fm,39.0997,-94.5786 -relay.hook.cafe,43.6532,-79.3832 -notemine.io,52.2026,20.9397 -relay.electriclifestyle.com,26.2897,-80.1293 -inbox.azzamo.net,52.2633,21.0283 -nostr.hekster.org,37.3986,-121.964 -relay.routstr.com,43.6532,-79.3832 -relay.puresignal.news,43.6532,-79.3832 -wot.dergigi.com,64.1476,-21.9392 -nostr-03.dorafactory.org,1.35208,103.82 -relay.fundstr.me,42.3601,-71.0589 -relayone.soundhsa.com,33.1384,-95.6011 -nostr.plantroon.com,50.1013,8.62643 -relay.ngengine.org,43.6532,-79.3832 -relay-dev.satlantis.io,40.8302,-74.1299 -relay.angor.io,48.1046,11.6002 -relay.toastr.net,40.8054,-74.0241 -relay.nostrhub.fr,48.1045,11.6004 -relay-rpi.edufeed.org,49.4521,11.0767 -relay.bitesize-media.com,49.4543,11.0746 -relay.usefusion.ai,38.7134,-78.1591 -chat-relay.zap-work.com,43.6532,-79.3832 -nostr.0x7e.xyz,47.4988,8.72369 -nostr.ps1829.com,33.8851,130.883 -relay.bullishbounty.com,43.6532,-79.3832 -nostr.openhoofd.nl,51.9229,4.40833 -nostr.blankfors.se,60.1699,24.9384 -strfry.openhoofd.nl,51.9229,4.40833 -relay.magiccity.live,25.8128,-80.2377 -relay.goodmorningbitcoin.com,43.6532,-79.3832 -nostr.notribe.net,40.8302,-74.1299 -slick.mjex.me,39.048,-77.4817 -nostr.davidebtc.me,51.5072,-0.127586 alien.macneilmediagroup.com,43.6532,-79.3832 -pyramid.treegaze.com,43.6532,-79.3832 -relay03.lnfi.network,39.0997,-94.5786 -relay.evanverma.com,40.8302,-74.1299 -nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 -nostr.chaima.info,51.223,6.78245 -no.str.cr,9.92857,-84.0528 -relay.jabato.space,52.52,13.405 -adre.su,59.9311,30.3609 -relay.hasenpfeffr.com,39.0438,-77.4874 -relay.etch.social,41.2619,-95.8608 -schnorr.me,43.6532,-79.3832 -relay.endfiat.money,43.6532,-79.3832 -relay.nostr.place,32.7767,-96.797 -nostr.sathoarder.com,48.5734,7.75211 -orly.ft.hn,50.4754,12.3683 -relay.samt.st,40.8302,-74.1299 +nostr.simplex.icu,51.5121,-0.0005238 +nostr.satstralia.com,64.1476,-21.9392 nostr-relay.amethyst.name,39.0438,-77.4874 +bcast.girino.org,43.6532,-79.3832 +purpura.cloud,43.6532,-79.3832 +wot.nostr.party,36.1627,-86.7816 +dev-relay.lnfi.network,39.0997,-94.5786 +temp.iris.to,43.6532,-79.3832 +relay.internationalright-wing.org,-22.5986,-48.8003 +relay.bitcoindistrict.org,43.6532,-79.3832 +srtrelay.c-stellar.net,43.6532,-79.3832 +nostr.mehdibekhtaoui.com,49.4939,-1.54813 +bucket.coracle.social,37.7775,-122.397 +relay.minibolt.info,43.6532,-79.3832 +fanfares.nostr1.com,40.7057,-74.0136 +nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 +cyberspace.nostr1.com,40.7128,-74.006 +relay.jeffg.fyi,43.6532,-79.3832 +nostr2.girino.org,43.6532,-79.3832 +relay.stream.labs.h3.se,59.4016,17.9455 +nostr.rikmeijer.nl,50.4754,12.3683 +relay.getsafebox.app,43.6532,-79.3832 +nostr-01.uid.ovh,43.6532,-79.3832 +relay.hasenpfeffr.com,39.0438,-77.4874 +wot.dtonon.com,43.6532,-79.3832 +nostrcheck.me,43.6532,-79.3832 +strfry.bonsai.com,37.8715,-122.273 +relay.degmods.com,50.4754,12.3683 +relay.nostx.io,43.6532,-79.3832 +strfry.elswa-dev.online,50.1109,8.68213 +relay.lightning.pub,39.0438,-77.4874 +nostr.jerrynya.fun,31.2304,121.474 +satsage.xyz,37.3986,-121.964 +relay-rpi.edufeed.org,49.4521,11.0767 +nostr.bond,50.1109,8.68213 +relay.lumina.rocks,49.0291,8.35695 +relay.samt.st,40.8302,-74.1299 +nostr.snowbla.de,60.1699,24.9384 +nostr.red5d.dev,43.6532,-79.3832 +nostr.tadryanom.me,43.6532,-79.3832 +relay.bullishbounty.com,43.6532,-79.3832 +nostr.calitabby.net,39.9268,-75.0246 +relay.hook.cafe,43.6532,-79.3832 +relay.21e6.cz,50.7383,15.0648 +nostr-relay.online,43.6532,-79.3832 +inbox.azzamo.net,52.2633,21.0283 +relay.chakany.systems,43.6532,-79.3832 +relay.coinos.io,43.6532,-79.3832 +nostr-relay.cbrx.io,43.6532,-79.3832 +relay.siamdev.cc,13.9178,100.424 +relay04.lnfi.network,39.0997,-94.5786 +wot.sovbit.host,64.1466,-21.9426 +bcast.seutoba.com.br,43.6532,-79.3832 +shu05.shugur.net,48.8566,2.35222 +wot.nostr.place,32.7767,-96.797 +nos.xmark.cc,50.6924,3.20113 +nostr-relay.corb.net,38.8353,-104.822 +relay5.bitransfer.org,43.6532,-79.3832 +nostr-relay.nextblockvending.com,47.2343,-119.853 +relay.fountain.fm,39.0997,-94.5786 +santo.iguanatech.net,40.8302,-74.1299 +bitcoiner.social,39.1585,-94.5728 +relay.nostr.place,32.7767,-96.797 +relay.fr13nd5.com,52.5233,13.3426 +nostr.myshosholoza.co.za,52.3676,4.90414 +nostr.kalf.org,52.3676,4.90414 +nostr.chaima.info,51.223,6.78245 +relay.usefusion.ai,38.7134,-78.1591 +nostr.faultables.net,43.6532,-79.3832 +ynostr.yael.at,60.1699,24.9384 +nostr.4rs.nl,49.0291,8.35696 +adre.su,59.9311,30.3609 +nostr.spaceshell.xyz,43.6532,-79.3832 +relay.angor.io,48.1046,11.6002 +r.bitcoinhold.net,43.6532,-79.3832 +nostr.mom,50.4754,12.3683 +relay.cosmicbolt.net,37.3986,-121.964 +freelay.sovbit.host,64.1476,-21.9392 +relay.npubhaus.com,43.6532,-79.3832 +schnorr.me,43.6532,-79.3832 +nostr.agentcampfire.com,52.3676,4.90414 +relay-arg.zombi.cloudrodion.com,1.35208,103.82 +strfry.felixzieger.de,50.1013,8.62643 +orly.ft.hn,50.4754,12.3683 +nostr.hifish.org,47.4043,8.57398 +relayone.soundhsa.com,33.1384,-95.6011 +relay-testnet.k8s.layer3.news,37.3387,-121.885 +relay.trustroots.org,43.6532,-79.3832 +soloco.nl,43.6532,-79.3832 +nostr.mikoshi.de,47.8786,11.911 +relay.holzeis.me,43.6532,-79.3832 +wot.sebastix.social,51.1792,5.89444 +nostr.azzamo.net,52.2633,21.0283 +wot.shaving.kiwi,43.6532,-79.3832 +nostr.night7.space,50.4754,12.3683 +nproxy.kristapsk.lv,60.1699,24.9384 +freeben666.fr,43.7221,7.15296 +relay.libernet.app,43.6532,-79.3832 +nostr.88mph.life,51.5072,-0.127586 +wot.tealeaf.dev,33.7488,-84.3877 +nostr.sathoarder.com,48.5734,7.75211 +relay.0xchat.com,1.35208,103.82 +relay.fundstr.me,42.3601,-71.0589 +nostr.lkjsxc.com,43.6532,-79.3832 +nostr.n7ekb.net,47.4941,-122.294 +relay.jabato.space,52.52,13.405 +nostr.davidebtc.me,51.5072,-0.127586 +relay.evanverma.com,40.8302,-74.1299 +wot.dergigi.com,64.1476,-21.9392 +relay.seq1.net,43.6532,-79.3832 +wot.yesnostr.net,50.9871,2.12554 +relay-freeharmonypeople.space,38.7223,-9.13934 +nostr.rblb.it,43.7094,10.6582 +ribo.us.nostria.app,41.5868,-93.625 +relay.nostar.org,43.6532,-79.3832 +purplerelay.com,50.1109,8.68213 +nostr-01.yakihonne.com,1.32123,103.695 +relay.jmoose.rocks,60.1699,24.9384 +bitsat.molonlabe.holdings,51.4012,-1.3147 +nos.lol,50.4754,12.3683 +shu02.shugur.net,21.4902,39.2246 +fenrir-s.notoshi.win,43.6532,-79.3832 +relay.puresignal.news,43.6532,-79.3832 +nostr.vulpem.com,49.4543,11.0746 +relay.etch.social,41.2619,-95.8608 +nostr.camalolo.com,24.1469,120.684 +nostr-2.21crypto.ch,47.5356,8.73209 +nostrelay.memory-art.xyz,43.6532,-79.3832 +relay.upleb.uk,51.9194,19.1451 +relay.sharegap.net,43.6532,-79.3832 +relay.2nix.de,60.1699,24.9384 +nostr.21crypto.ch,47.5356,8.73209 +relay.mattybs.lol,43.6532,-79.3832 +relayb.uid.ovh,43.6532,-79.3832 +nostr.hekster.org,37.3986,-121.964 +shu04.shugur.net,25.2604,55.2989 +nostrelay.circum.space,52.3676,4.90414 +nostr.tavux.tech,48.8575,2.35138 +nostr.thebiglake.org,32.71,-96.6745 +khatru.nostrver.se,51.1792,5.89444 +relay.damus.io,43.6532,-79.3832 +relay.wavlake.com,41.2619,-95.8608 +relay2.angor.io,48.1046,11.6002 +nostr.spicyz.io,43.6532,-79.3832 +nostr.bilthon.dev,25.8128,-80.2377 +nostr.now,36.55,139.733 +shu01.shugur.net,21.4902,39.2246 +spatia-arcana.com,34.0362,-118.443 +nos4smartnkind.tech,40.1872,44.5152 +nostr-relay.xbytez.io,50.6924,3.20113 +wheat.happytavern.co,43.6532,-79.3832 +relay.notoshi.win,13.311,101.112 +theoutpost.life,64.1476,-21.9392 +nostr.tuckerbradford.com,43.663,-70.2569 +nostrcheck.tnsor.network,43.6532,-79.3832 +nostr.coincards.com,53.5501,-113.469 +relay.cypherflow.ai,48.8566,2.35222 +relay.btcforplebs.com,43.6532,-79.3832 +nostr.data.haus,50.4754,12.3683 +relay.satlantis.io,32.8769,-80.0114 +relay.agora.social,50.7383,15.0648 +notemine.io,52.2026,20.9397 +relay.nostr.band,60.1699,24.9384 +relay.orangepill.ovh,49.1689,-0.358841 +strfry.shock.network,39.0438,-77.4874 +relay.dwadziesciajeden.pl,52.2297,21.0122 +articles.layer3.news,37.3387,-121.885 +nostr.czas.top,50.1109,8.68213 +relay.olas.app,50.4754,12.3683 +orangepiller.org,60.1699,24.9384 +nostr-02.yakihonne.com,1.32123,103.695 +relay.thebluepulse.com,49.4521,11.0767 +relay.binaryrobot.com,43.6532,-79.3832 +prl.plus,56.9677,24.1056 +strfry.openhoofd.nl,51.9229,4.40833 +nostr.girino.org,43.6532,-79.3832 +relay.satmaxt.xyz,43.6532,-79.3832 +nostr-02.czas.top,51.2277,6.77346 +nostrelites.org,41.8781,-87.6298 +nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 +nostr-relay.zimage.com,34.0549,-118.243 +wot.soundhsa.com,33.1384,-95.6011 +relay.letsfo.com,51.098,17.0321 +relay.vrtmrz.net,43.6532,-79.3832 +ribo.eu.nostria.app,52.3676,4.90414 +relay.nostr.wirednet.jp,34.706,135.493 +relay.snort.social,53.3498,-6.26031 +nostr.huszonegy.world,47.4979,19.0402 +nostream.breadslice.com,1.35208,103.82 +relay.credenso.cafe,43.3601,-80.3127 +relay.tagayasu.xyz,43.6715,-79.38 +nostr.stakey.net,52.3676,4.90414 +relay.artx.market,43.652,-79.3633 +relay.sigit.io,50.4754,12.3683 +librerelay.aaroniumii.com,43.6532,-79.3832 +nostr.noones.com,50.1109,8.68213 +pyramid.treegaze.com,43.6532,-79.3832 +relay.crostr.com,43.6532,-79.3832 +relay03.lnfi.network,39.0997,-94.5786 +no.str.cr,9.92857,-84.0528 +relay.nostrhub.tech,49.0291,8.35696 +nostr.overmind.lol,43.6532,-79.3832 +kotukonostr.onrender.com,37.7775,-122.397 +relay.chorus.community,50.1109,8.68213 +relay.zone667.com,60.1699,24.9384 +relay01.lnfi.network,39.0997,-94.5786 +nostr.ps1829.com,33.8851,130.883 +offchain.pub,47.6743,-117.112 +nostr.plantroon.com,50.1013,8.62643 +relay.nostr-check.me,43.6532,-79.3832 +nostr.oxtr.dev,50.4754,12.3683 +black.nostrcity.club,48.8575,2.35138 +relay.uid.ovh,43.6532,-79.3832 +nostr.rtvslawenia.com,49.4543,11.0746 +relay.nostriot.com,41.5695,-83.9786 +wot.brightbolt.net,47.6735,-116.781 +relay.toastr.net,40.8054,-74.0241 +nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 +nostr.zoracle.org,45.6018,-121.185 +relay.wolfcoil.com,35.6092,139.73 +premium.primal.net,43.6532,-79.3832 +nostr.roundrockbitcoiners.com,40.8054,-74.0241 +relay.thibautduchene.fr,43.6532,-79.3832 +relay.illuminodes.com,47.6061,-122.333 +relay.ngengine.org,43.6532,-79.3832 +dev-nostr.bityacht.io,25.0797,121.234 +wot.sudocarlos.com,51.5072,-0.127586 +relay.islandbitcoin.com,12.8498,77.6545 +nostr.blankfors.se,60.1699,24.9384 +relay2.ngengine.org,43.6532,-79.3832 +relay.nostr.net,43.6532,-79.3832 +alienos.libretechsystems.xyz,55.4724,9.87335 +relay-dev.satlantis.io,40.8302,-74.1299 +relay.divine.video,43.6532,-79.3832 +nostr.tac.lol,47.4748,-122.273 +relay.zombi.cloudrodion.com,48.8566,2.35222 +relay.mostro.network,40.8302,-74.1299 +relay.arx-ccn.com,50.4754,12.3683 +relay.davidebtc.me,51.5072,-0.127586 +wot.codingarena.top,50.4754,12.3683 +relay.bitcoinartclock.com,50.4754,12.3683 +nostr.nodesmap.com,59.3327,18.0656 +relay.nostrdice.com,-33.8688,151.209 +wot.nostr.net,43.6532,-79.3832 +relay02.lnfi.network,39.0997,-94.5786 +relayrs.notoshi.win,43.6532,-79.3832 +relay.nostrhub.fr,48.1045,11.6004 +nostr.openhoofd.nl,51.9229,4.40833 +relay.wavefunc.live,34.0362,-118.443 +nostr.coincrowd.fund,39.0438,-77.4874 +relay.mccormick.cx,52.3563,4.95714 +slick.mjex.me,39.048,-77.4817 +relay.nostrcheck.me,43.6532,-79.3832 +nostr.notribe.net,40.8302,-74.1299 +relay.primal.net,43.6532,-79.3832 +vitor.nostr1.com,40.7057,-74.0136 +relay.bitcoinveneto.org,64.1466,-21.9426 +public.crostr.com,43.6532,-79.3832 +nostr.ovia.to,43.6532,-79.3832 +ithurtswhenip.ee,51.223,6.78245 +relay.origin.land,35.6673,139.751 +relay.nostrzh.org,43.6532,-79.3832 +orangesync.tech,50.1109,8.68213 +nostr.bitcoiner.social,39.1585,-94.5728 +relay.javi.space,43.4633,11.8796 +relay.electriclifestyle.com,26.2897,-80.1293 +x.kojira.io,43.6532,-79.3832 +relay.endfiat.money,43.6532,-79.3832 +relay.magiccity.live,25.8128,-80.2377 +chat-relay.zap-work.com,43.6532,-79.3832 +nostr-03.dorafactory.org,1.35208,103.82 +nostr-relay.psfoundation.info,39.0438,-77.4874 +relay.goodmorningbitcoin.com,43.6532,-79.3832 +relay.routstr.com,43.6532,-79.3832 +nostr.luisschwab.net,43.6532,-79.3832 +nostr.diakod.com,43.6532,-79.3832 +relay.guggero.org,47.3769,8.54169 +nostr.0x7e.xyz,47.4988,8.72369 +yabu.me,35.6092,139.73 +relay.ru.ac.th,13.7607,100.627 +relay.moinsen.com,50.4754,12.3683 +relay.nuts.cash,34.0362,-118.443 +relay.ditto.pub,43.6532,-79.3832 From 743bbd0b1c1edc6d7728eb0b89eaae7334202ebf Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Sun, 14 Dec 2025 21:55:41 +0700 Subject: [PATCH 02/10] bump targetSdk (#526) --- app/lint-baseline.xml | 11 ----------- gradle/libs.versions.toml | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index cd316d72..4bc0bb5c 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -243,17 +243,6 @@ column="35"/> - - - - Date: Sun, 21 Dec 2025 06:06:56 +0000 Subject: [PATCH 03/10] Automated update of relay data - Sun Dec 21 06:06:56 UTC 2025 --- app/src/main/assets/nostr_relays.csv | 548 +++++++++++++-------------- 1 file changed, 273 insertions(+), 275 deletions(-) diff --git a/app/src/main/assets/nostr_relays.csv b/app/src/main/assets/nostr_relays.csv index 2288010a..03e8c247 100644 --- a/app/src/main/assets/nostr_relays.csv +++ b/app/src/main/assets/nostr_relays.csv @@ -1,285 +1,283 @@ Relay URL,Latitude,Longitude -alien.macneilmediagroup.com,43.6532,-79.3832 -nostr.simplex.icu,51.5121,-0.0005238 -nostr.satstralia.com,64.1476,-21.9392 -nostr-relay.amethyst.name,39.0438,-77.4874 -bcast.girino.org,43.6532,-79.3832 -purpura.cloud,43.6532,-79.3832 -wot.nostr.party,36.1627,-86.7816 -dev-relay.lnfi.network,39.0997,-94.5786 -temp.iris.to,43.6532,-79.3832 -relay.internationalright-wing.org,-22.5986,-48.8003 -relay.bitcoindistrict.org,43.6532,-79.3832 -srtrelay.c-stellar.net,43.6532,-79.3832 -nostr.mehdibekhtaoui.com,49.4939,-1.54813 -bucket.coracle.social,37.7775,-122.397 -relay.minibolt.info,43.6532,-79.3832 -fanfares.nostr1.com,40.7057,-74.0136 -nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 -cyberspace.nostr1.com,40.7128,-74.006 -relay.jeffg.fyi,43.6532,-79.3832 -nostr2.girino.org,43.6532,-79.3832 -relay.stream.labs.h3.se,59.4016,17.9455 -nostr.rikmeijer.nl,50.4754,12.3683 -relay.getsafebox.app,43.6532,-79.3832 -nostr-01.uid.ovh,43.6532,-79.3832 -relay.hasenpfeffr.com,39.0438,-77.4874 -wot.dtonon.com,43.6532,-79.3832 -nostrcheck.me,43.6532,-79.3832 -strfry.bonsai.com,37.8715,-122.273 -relay.degmods.com,50.4754,12.3683 -relay.nostx.io,43.6532,-79.3832 -strfry.elswa-dev.online,50.1109,8.68213 -relay.lightning.pub,39.0438,-77.4874 -nostr.jerrynya.fun,31.2304,121.474 -satsage.xyz,37.3986,-121.964 -relay-rpi.edufeed.org,49.4521,11.0767 -nostr.bond,50.1109,8.68213 -relay.lumina.rocks,49.0291,8.35695 -relay.samt.st,40.8302,-74.1299 -nostr.snowbla.de,60.1699,24.9384 -nostr.red5d.dev,43.6532,-79.3832 -nostr.tadryanom.me,43.6532,-79.3832 -relay.bullishbounty.com,43.6532,-79.3832 -nostr.calitabby.net,39.9268,-75.0246 -relay.hook.cafe,43.6532,-79.3832 -relay.21e6.cz,50.7383,15.0648 -nostr-relay.online,43.6532,-79.3832 -inbox.azzamo.net,52.2633,21.0283 -relay.chakany.systems,43.6532,-79.3832 -relay.coinos.io,43.6532,-79.3832 -nostr-relay.cbrx.io,43.6532,-79.3832 -relay.siamdev.cc,13.9178,100.424 -relay04.lnfi.network,39.0997,-94.5786 -wot.sovbit.host,64.1466,-21.9426 -bcast.seutoba.com.br,43.6532,-79.3832 -shu05.shugur.net,48.8566,2.35222 -wot.nostr.place,32.7767,-96.797 -nos.xmark.cc,50.6924,3.20113 -nostr-relay.corb.net,38.8353,-104.822 -relay5.bitransfer.org,43.6532,-79.3832 -nostr-relay.nextblockvending.com,47.2343,-119.853 -relay.fountain.fm,39.0997,-94.5786 -santo.iguanatech.net,40.8302,-74.1299 -bitcoiner.social,39.1585,-94.5728 -relay.nostr.place,32.7767,-96.797 -relay.fr13nd5.com,52.5233,13.3426 -nostr.myshosholoza.co.za,52.3676,4.90414 -nostr.kalf.org,52.3676,4.90414 -nostr.chaima.info,51.223,6.78245 -relay.usefusion.ai,38.7134,-78.1591 -nostr.faultables.net,43.6532,-79.3832 -ynostr.yael.at,60.1699,24.9384 -nostr.4rs.nl,49.0291,8.35696 -adre.su,59.9311,30.3609 -nostr.spaceshell.xyz,43.6532,-79.3832 -relay.angor.io,48.1046,11.6002 -r.bitcoinhold.net,43.6532,-79.3832 -nostr.mom,50.4754,12.3683 -relay.cosmicbolt.net,37.3986,-121.964 -freelay.sovbit.host,64.1476,-21.9392 -relay.npubhaus.com,43.6532,-79.3832 -schnorr.me,43.6532,-79.3832 -nostr.agentcampfire.com,52.3676,4.90414 -relay-arg.zombi.cloudrodion.com,1.35208,103.82 -strfry.felixzieger.de,50.1013,8.62643 -orly.ft.hn,50.4754,12.3683 -nostr.hifish.org,47.4043,8.57398 -relayone.soundhsa.com,33.1384,-95.6011 -relay-testnet.k8s.layer3.news,37.3387,-121.885 -relay.trustroots.org,43.6532,-79.3832 -soloco.nl,43.6532,-79.3832 -nostr.mikoshi.de,47.8786,11.911 -relay.holzeis.me,43.6532,-79.3832 -wot.sebastix.social,51.1792,5.89444 -nostr.azzamo.net,52.2633,21.0283 -wot.shaving.kiwi,43.6532,-79.3832 -nostr.night7.space,50.4754,12.3683 -nproxy.kristapsk.lv,60.1699,24.9384 -freeben666.fr,43.7221,7.15296 -relay.libernet.app,43.6532,-79.3832 -nostr.88mph.life,51.5072,-0.127586 -wot.tealeaf.dev,33.7488,-84.3877 -nostr.sathoarder.com,48.5734,7.75211 -relay.0xchat.com,1.35208,103.82 -relay.fundstr.me,42.3601,-71.0589 -nostr.lkjsxc.com,43.6532,-79.3832 -nostr.n7ekb.net,47.4941,-122.294 -relay.jabato.space,52.52,13.405 -nostr.davidebtc.me,51.5072,-0.127586 -relay.evanverma.com,40.8302,-74.1299 -wot.dergigi.com,64.1476,-21.9392 -relay.seq1.net,43.6532,-79.3832 -wot.yesnostr.net,50.9871,2.12554 -relay-freeharmonypeople.space,38.7223,-9.13934 -nostr.rblb.it,43.7094,10.6582 -ribo.us.nostria.app,41.5868,-93.625 -relay.nostar.org,43.6532,-79.3832 -purplerelay.com,50.1109,8.68213 -nostr-01.yakihonne.com,1.32123,103.695 -relay.jmoose.rocks,60.1699,24.9384 -bitsat.molonlabe.holdings,51.4012,-1.3147 -nos.lol,50.4754,12.3683 -shu02.shugur.net,21.4902,39.2246 -fenrir-s.notoshi.win,43.6532,-79.3832 -relay.puresignal.news,43.6532,-79.3832 -nostr.vulpem.com,49.4543,11.0746 -relay.etch.social,41.2619,-95.8608 -nostr.camalolo.com,24.1469,120.684 -nostr-2.21crypto.ch,47.5356,8.73209 -nostrelay.memory-art.xyz,43.6532,-79.3832 -relay.upleb.uk,51.9194,19.1451 -relay.sharegap.net,43.6532,-79.3832 -relay.2nix.de,60.1699,24.9384 -nostr.21crypto.ch,47.5356,8.73209 -relay.mattybs.lol,43.6532,-79.3832 -relayb.uid.ovh,43.6532,-79.3832 -nostr.hekster.org,37.3986,-121.964 -shu04.shugur.net,25.2604,55.2989 -nostrelay.circum.space,52.3676,4.90414 -nostr.tavux.tech,48.8575,2.35138 -nostr.thebiglake.org,32.71,-96.6745 -khatru.nostrver.se,51.1792,5.89444 -relay.damus.io,43.6532,-79.3832 -relay.wavlake.com,41.2619,-95.8608 -relay2.angor.io,48.1046,11.6002 -nostr.spicyz.io,43.6532,-79.3832 -nostr.bilthon.dev,25.8128,-80.2377 -nostr.now,36.55,139.733 -shu01.shugur.net,21.4902,39.2246 -spatia-arcana.com,34.0362,-118.443 -nos4smartnkind.tech,40.1872,44.5152 -nostr-relay.xbytez.io,50.6924,3.20113 -wheat.happytavern.co,43.6532,-79.3832 -relay.notoshi.win,13.311,101.112 -theoutpost.life,64.1476,-21.9392 -nostr.tuckerbradford.com,43.663,-70.2569 -nostrcheck.tnsor.network,43.6532,-79.3832 -nostr.coincards.com,53.5501,-113.469 -relay.cypherflow.ai,48.8566,2.35222 -relay.btcforplebs.com,43.6532,-79.3832 -nostr.data.haus,50.4754,12.3683 -relay.satlantis.io,32.8769,-80.0114 -relay.agora.social,50.7383,15.0648 -notemine.io,52.2026,20.9397 -relay.nostr.band,60.1699,24.9384 -relay.orangepill.ovh,49.1689,-0.358841 -strfry.shock.network,39.0438,-77.4874 -relay.dwadziesciajeden.pl,52.2297,21.0122 -articles.layer3.news,37.3387,-121.885 -nostr.czas.top,50.1109,8.68213 -relay.olas.app,50.4754,12.3683 -orangepiller.org,60.1699,24.9384 -nostr-02.yakihonne.com,1.32123,103.695 -relay.thebluepulse.com,49.4521,11.0767 -relay.binaryrobot.com,43.6532,-79.3832 -prl.plus,56.9677,24.1056 -strfry.openhoofd.nl,51.9229,4.40833 -nostr.girino.org,43.6532,-79.3832 -relay.satmaxt.xyz,43.6532,-79.3832 -nostr-02.czas.top,51.2277,6.77346 -nostrelites.org,41.8781,-87.6298 -nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 -nostr-relay.zimage.com,34.0549,-118.243 -wot.soundhsa.com,33.1384,-95.6011 -relay.letsfo.com,51.098,17.0321 -relay.vrtmrz.net,43.6532,-79.3832 -ribo.eu.nostria.app,52.3676,4.90414 -relay.nostr.wirednet.jp,34.706,135.493 -relay.snort.social,53.3498,-6.26031 -nostr.huszonegy.world,47.4979,19.0402 -nostream.breadslice.com,1.35208,103.82 -relay.credenso.cafe,43.3601,-80.3127 -relay.tagayasu.xyz,43.6715,-79.38 -nostr.stakey.net,52.3676,4.90414 -relay.artx.market,43.652,-79.3633 -relay.sigit.io,50.4754,12.3683 -librerelay.aaroniumii.com,43.6532,-79.3832 -nostr.noones.com,50.1109,8.68213 -pyramid.treegaze.com,43.6532,-79.3832 -relay.crostr.com,43.6532,-79.3832 -relay03.lnfi.network,39.0997,-94.5786 -no.str.cr,9.92857,-84.0528 -relay.nostrhub.tech,49.0291,8.35696 -nostr.overmind.lol,43.6532,-79.3832 -kotukonostr.onrender.com,37.7775,-122.397 -relay.chorus.community,50.1109,8.68213 -relay.zone667.com,60.1699,24.9384 -relay01.lnfi.network,39.0997,-94.5786 -nostr.ps1829.com,33.8851,130.883 -offchain.pub,47.6743,-117.112 -nostr.plantroon.com,50.1013,8.62643 -relay.nostr-check.me,43.6532,-79.3832 -nostr.oxtr.dev,50.4754,12.3683 -black.nostrcity.club,48.8575,2.35138 -relay.uid.ovh,43.6532,-79.3832 -nostr.rtvslawenia.com,49.4543,11.0746 relay.nostriot.com,41.5695,-83.9786 -wot.brightbolt.net,47.6735,-116.781 -relay.toastr.net,40.8054,-74.0241 -nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 -nostr.zoracle.org,45.6018,-121.185 -relay.wolfcoil.com,35.6092,139.73 -premium.primal.net,43.6532,-79.3832 -nostr.roundrockbitcoiners.com,40.8054,-74.0241 -relay.thibautduchene.fr,43.6532,-79.3832 relay.illuminodes.com,47.6061,-122.333 -relay.ngengine.org,43.6532,-79.3832 -dev-nostr.bityacht.io,25.0797,121.234 -wot.sudocarlos.com,51.5072,-0.127586 -relay.islandbitcoin.com,12.8498,77.6545 -nostr.blankfors.se,60.1699,24.9384 -relay2.ngengine.org,43.6532,-79.3832 -relay.nostr.net,43.6532,-79.3832 -alienos.libretechsystems.xyz,55.4724,9.87335 -relay-dev.satlantis.io,40.8302,-74.1299 -relay.divine.video,43.6532,-79.3832 -nostr.tac.lol,47.4748,-122.273 -relay.zombi.cloudrodion.com,48.8566,2.35222 -relay.mostro.network,40.8302,-74.1299 -relay.arx-ccn.com,50.4754,12.3683 -relay.davidebtc.me,51.5072,-0.127586 -wot.codingarena.top,50.4754,12.3683 -relay.bitcoinartclock.com,50.4754,12.3683 -nostr.nodesmap.com,59.3327,18.0656 -relay.nostrdice.com,-33.8688,151.209 -wot.nostr.net,43.6532,-79.3832 -relay02.lnfi.network,39.0997,-94.5786 -relayrs.notoshi.win,43.6532,-79.3832 -relay.nostrhub.fr,48.1045,11.6004 -nostr.openhoofd.nl,51.9229,4.40833 -relay.wavefunc.live,34.0362,-118.443 -nostr.coincrowd.fund,39.0438,-77.4874 -relay.mccormick.cx,52.3563,4.95714 -slick.mjex.me,39.048,-77.4817 -relay.nostrcheck.me,43.6532,-79.3832 -nostr.notribe.net,40.8302,-74.1299 -relay.primal.net,43.6532,-79.3832 -vitor.nostr1.com,40.7057,-74.0136 -relay.bitcoinveneto.org,64.1466,-21.9426 -public.crostr.com,43.6532,-79.3832 -nostr.ovia.to,43.6532,-79.3832 -ithurtswhenip.ee,51.223,6.78245 +relay.hook.cafe,43.6532,-79.3832 +relay.controller-ai.com,52.3563,4.95714 +relay.hasenpfeffr.com,39.0438,-77.4874 +nostr-relay.zimage.com,34.0549,-118.243 +relay.mattybs.lol,43.6532,-79.3832 +nostr.rblb.it,43.7094,10.6582 relay.origin.land,35.6673,139.751 -relay.nostrzh.org,43.6532,-79.3832 -orangesync.tech,50.1109,8.68213 -nostr.bitcoiner.social,39.1585,-94.5728 -relay.javi.space,43.4633,11.8796 -relay.electriclifestyle.com,26.2897,-80.1293 +nostr2.girino.org,43.6532,-79.3832 +nostr-relay.nextblockvending.com,47.2343,-119.853 +nostr.agentcampfire.com,52.3676,4.90414 +relay.olas.app,50.4754,12.3683 +soloco.nl,43.6532,-79.3832 +relay.usefusion.ai,38.7134,-78.1591 +nostr.lkjsxc.com,43.6532,-79.3832 +nostr.spicyz.io,43.6532,-79.3832 +relay.getsafebox.app,43.6532,-79.3832 +nostr.nodesmap.com,59.3327,18.0656 +nostr.88mph.life,51.5072,-0.127586 +relay04.lnfi.network,39.0997,-94.5786 +relay.uid.ovh,43.6532,-79.3832 +nostr.coincards.com,53.5501,-113.469 +srtrelay.c-stellar.net,43.6532,-79.3832 +purpura.cloud,43.6532,-79.3832 +nostream.breadslice.com,1.35208,103.82 +nostr.hifish.org,47.4043,8.57398 +nostr.data.haus,50.4754,12.3683 +relay.bullishbounty.com,43.6532,-79.3832 +nostr.superfriends.online,43.6532,-79.3832 x.kojira.io,43.6532,-79.3832 -relay.endfiat.money,43.6532,-79.3832 -relay.magiccity.live,25.8128,-80.2377 -chat-relay.zap-work.com,43.6532,-79.3832 -nostr-03.dorafactory.org,1.35208,103.82 -nostr-relay.psfoundation.info,39.0438,-77.4874 -relay.goodmorningbitcoin.com,43.6532,-79.3832 -relay.routstr.com,43.6532,-79.3832 +nostr.czas.top,50.1109,8.68213 +relay.seq1.net,43.6532,-79.3832 nostr.luisschwab.net,43.6532,-79.3832 -nostr.diakod.com,43.6532,-79.3832 -relay.guggero.org,47.3769,8.54169 +temp.iris.to,43.6532,-79.3832 +nostr.azzamo.net,52.2633,21.0283 +orangepiller.org,60.1699,24.9384 +freeben666.fr,43.7221,7.15296 +strfry.elswa-dev.online,50.1109,8.68213 +wot.dtonon.com,43.6532,-79.3832 +relay.primal.net,43.6532,-79.3832 +schnorr.me,43.6532,-79.3832 nostr.0x7e.xyz,47.4988,8.72369 +nostr.spaceshell.xyz,43.6532,-79.3832 +relay.0xchat.com,1.35208,103.82 +nostr.kalf.org,52.3676,4.90414 +relay.cypherflow.ai,48.8566,2.35222 +chat-relay.zap-work.com,43.6532,-79.3832 +relay01.lnfi.network,39.0997,-94.5786 +nostr.commonshub.brussels,49.4543,11.0746 +nostr.rikmeijer.nl,50.4754,12.3683 +nostr.calitabby.net,39.9268,-75.0246 +relay.snort.social,53.3498,-6.26031 +nostr.sathoarder.com,48.5734,7.75211 +strfry.openhoofd.nl,51.9229,4.40833 yabu.me,35.6092,139.73 -relay.ru.ac.th,13.7607,100.627 -relay.moinsen.com,50.4754,12.3683 +relay.nostrhub.tech,49.0291,8.35696 +relay.mostro.network,40.8302,-74.1299 +bcast.seutoba.com.br,43.6532,-79.3832 +nostr.satstralia.com,64.1476,-21.9392 +nostr.21crypto.ch,47.5356,8.73209 +santo.iguanatech.net,40.8302,-74.1299 +notemine.io,52.2026,20.9397 +nostr.ps1829.com,33.8851,130.883 +relay.nostr.place,32.7767,-96.797 +alienos.libretechsystems.xyz,55.4724,9.87335 +nostr.bond,50.1109,8.68213 +relay.nostrdice.com,-33.8688,151.209 +nostr-verified.wellorder.net,45.5201,-122.99 +nostr-01.yakihonne.com,1.32123,103.695 +strfry.shock.network,39.0438,-77.4874 +relay.evanverma.com,40.8302,-74.1299 +relay.davidebtc.me,51.5072,-0.127586 +nostr-relay.online,43.6532,-79.3832 +bitsat.molonlabe.holdings,51.4012,-1.3147 +relay.angor.io,48.1046,11.6002 +nostr.openhoofd.nl,51.9229,4.40833 +relay.smies.me,33.7501,-84.3885 +relay-testnet.k8s.layer3.news,37.3387,-121.885 +nostr.plantroon.com,50.1013,8.62643 +dev-relay.lnfi.network,39.0997,-94.5786 +nostr-relay.xbytez.io,50.6924,3.20113 +nostr.camalolo.com,24.1469,120.684 +relay-dev.satlantis.io,40.8302,-74.1299 +relay.artx.market,43.652,-79.3633 +wot.sovbit.host,64.1466,-21.9426 +relay.fundstr.me,42.3601,-71.0589 +nostr.hekster.org,37.3986,-121.964 +relay.libernet.app,43.6532,-79.3832 +nostr.n7ekb.net,47.4941,-122.294 +relay.thibautduchene.fr,43.6532,-79.3832 +nostr.mikoshi.de,47.74,12.0917 +relayone.soundhsa.com,33.1384,-95.6011 +relay.nosto.re,51.1792,5.89444 +relay.notoshi.win,13.311,101.112 +neuromancer.nettek.io,39.1429,-94.573 +nostr.ovia.to,43.6532,-79.3832 +relay.trustroots.org,43.6532,-79.3832 +relay.thebluepulse.com,49.4521,11.0767 +strfry.felixzieger.de,50.1013,8.62643 +relay.nostr.band,60.1699,24.9384 +relay2.angor.io,48.1046,11.6002 +relay.wavlake.com,41.2619,-95.8608 +ithurtswhenip.ee,51.223,6.78245 +shu05.shugur.net,48.8566,2.35222 +wot.shaving.kiwi,43.6532,-79.3832 +wot.nostr.party,36.1627,-86.7816 +relay.bitcoinveneto.org,64.1466,-21.9426 +relay.siamdev.cc,13.9178,100.424 +relay.ngengine.org,43.6532,-79.3832 +relay.sigit.io,50.4754,12.3683 +relay.electriclifestyle.com,26.2897,-80.1293 +relay.nostar.org,43.6532,-79.3832 +nostr.oxtr.dev,50.4754,12.3683 +nostr.vulpem.com,49.4543,11.0746 +relay02.lnfi.network,39.0997,-94.5786 +relay.upleb.uk,51.9194,19.1451 +relay.bitcoinartclock.com,50.4754,12.3683 +nostrelay.circum.space,52.3676,4.90414 +relay.camelus.app,45.5201,-122.99 +nostr-relay.cbrx.io,43.6532,-79.3832 +espelho.girino.org,43.6532,-79.3832 +relay.lightning.pub,39.0438,-77.4874 +ribo.us.nostria.app,41.5868,-93.625 +relay.openfarmtools.org,60.1699,24.9384 +vault.iris.to,43.6532,-79.3832 +nostr.quali.chat,60.1699,24.9384 +relay.wolfcoil.com,35.6092,139.73 +adre.su,59.9311,30.3609 +relay.nostrzh.org,43.6532,-79.3832 +cyberspace.nostr1.com,40.7128,-74.006 +relay.divine.video,43.6532,-79.3832 +relay-arg.zombi.cloudrodion.com,1.35208,103.82 +relay.cosmicbolt.net,37.3986,-121.964 +black.nostrcity.club,48.8575,2.35138 +nostr-relay.psfoundation.info,39.0438,-77.4874 +relay.tagayasu.xyz,43.6715,-79.38 +nostr.now,36.55,139.733 +shu04.shugur.net,25.2604,55.2989 +relay.samt.st,40.8302,-74.1299 +relay03.lnfi.network,39.0997,-94.5786 +nostr-02.yakihonne.com,1.32123,103.695 +nostr.tac.lol,47.4748,-122.273 +theoutpost.life,64.1476,-21.9392 +relay.dwadziesciajeden.pl,52.2297,21.0122 +nostr.huszonegy.world,47.4979,19.0402 +relay.zombi.cloudrodion.com,48.8566,2.35222 +nr.yay.so,46.2126,6.1154 +offchain.pub,47.6743,-117.112 +relay.jeffg.fyi,43.6532,-79.3832 +relay.wavefunc.live,34.0362,-118.443 +relay.islandbitcoin.com,12.8498,77.6545 +nostr-relay.amethyst.name,39.0438,-77.4874 +inbox.azzamo.net,52.2633,21.0283 +nostr.tadryanom.me,43.6532,-79.3832 +relay5.bitransfer.org,43.6532,-79.3832 +nostr.tavux.tech,48.8575,2.35138 +nostr.blankfors.se,60.1699,24.9384 +nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 +nos.xmark.cc,50.6924,3.20113 +relay-freeharmonypeople.space,38.7223,-9.13934 +nostr.mehdibekhtaoui.com,49.4939,-1.54813 +nostr-02.czas.top,51.2277,6.77346 +relay.puresignal.news,43.6532,-79.3832 +nostr.faultables.net,43.6532,-79.3832 +relay.satmaxt.xyz,43.6532,-79.3832 +relay.degmods.com,50.4754,12.3683 +nos.lol,50.4754,12.3683 +wheat.happytavern.co,43.6532,-79.3832 +relays.diggoo.com,43.6532,-79.3832 +relay.chakany.systems,43.6532,-79.3832 +wot.sudocarlos.com,51.5072,-0.127586 +relay.vrtmrz.net,43.6532,-79.3832 +bucket.coracle.social,37.7775,-122.397 +relay.damus.io,43.6532,-79.3832 +relay.npubhaus.com,43.6532,-79.3832 relay.nuts.cash,34.0362,-118.443 relay.ditto.pub,43.6532,-79.3832 +relay.agora.social,50.7383,15.0648 +librerelay.aaroniumii.com,43.6532,-79.3832 +ribo.eu.nostria.app,52.3676,4.90414 +vitor.nostr1.com,40.7057,-74.0136 +nostr-2.21crypto.ch,47.5356,8.73209 +relay.etch.social,41.2619,-95.8608 +nostr.noones.com,50.1109,8.68213 +nostrcheck.tnsor.network,43.6532,-79.3832 +nostr.overmind.lol,43.6532,-79.3832 +nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 +relay.coinos.io,43.6532,-79.3832 +relay.moinsen.com,50.4754,12.3683 +relay.letsfo.com,51.098,17.0321 +nostr-pub.wellorder.net,45.5201,-122.99 +relayone.geektank.ai,18.2148,-63.0574 +relay-rpi.edufeed.org,49.4521,11.0767 +relay.orangepill.ovh,49.1689,-0.358841 +relay.chorus.community,50.1109,8.68213 +ynostr.yael.at,60.1699,24.9384 +relay.agorist.space,52.3734,4.89406 +khatru.nostrver.se,51.1792,5.89444 +relay.binaryrobot.com,43.6532,-79.3832 +relay.zone667.com,60.1699,24.9384 +relay.javi.space,43.4633,11.8796 +nostr.roundrockbitcoiners.com,40.8054,-74.0241 +relay.minibolt.info,43.6532,-79.3832 +relay.nostr.wirednet.jp,34.706,135.493 +wot.dergigi.com,64.1476,-21.9392 +nostr-03.dorafactory.org,1.35208,103.82 +bitcoiner.social,39.1585,-94.5728 +prl.plus,42.6978,23.3246 +nostr.night7.space,50.4754,12.3683 +nostr.notribe.net,40.8302,-74.1299 +no.str.cr,9.92857,-84.0528 +relay.21e6.cz,50.7383,15.0648 +relay.bitcoindistrict.org,43.6532,-79.3832 +nostr.bilthon.dev,25.8128,-80.2377 +relay.endfiat.money,43.6532,-79.3832 +wot.nostr.place,32.7767,-96.797 +bcast.girino.org,43.6532,-79.3832 +nostr.thebiglake.org,32.71,-96.6745 +relay.satlantis.io,32.8769,-80.0114 +relay.btcforplebs.com,43.6532,-79.3832 +nostr.stakey.net,52.3676,4.90414 +relay.nostr-check.me,43.6532,-79.3832 +nostr.girino.org,43.6532,-79.3832 +nostr.rtvslawenia.com,49.4543,11.0746 +relay2.ngengine.org,43.6532,-79.3832 +pyramid.treegaze.com,43.6532,-79.3832 +articles.layer3.news,37.3387,-121.885 +relay.fountain.fm,39.0997,-94.5786 +relay.mccormick.cx,52.3563,4.95714 +relay.routstr.com,43.6532,-79.3832 +relay.arx-ccn.com,50.4754,12.3683 +nostr.tuckerbradford.com,43.663,-70.2569 +nostr.zoracle.org,45.6018,-121.185 +nostr.jerrynya.fun,31.2304,121.474 +relay.nostr.net,43.6532,-79.3832 +relay.holzeis.me,43.6532,-79.3832 +relay.wellorder.net,45.5201,-122.99 +relay.guggero.org,47.3769,8.54169 +nostr.red5d.dev,43.6532,-79.3832 +nostr-01.uid.ovh,43.6532,-79.3832 +r.bitcoinhold.net,43.6532,-79.3832 +relay.nostrhub.fr,48.1045,11.6004 +wot.sebastix.social,51.1792,5.89444 +nostr.mom,50.4754,12.3683 +nos4smartnkind.tech,40.1872,44.5152 +nostr.casa21.space,43.6532,-79.3832 +relay.nostrcheck.me,43.6532,-79.3832 +kotukonostr.onrender.com,37.7775,-122.397 +nostr-dev.wellorder.net,45.5201,-122.99 +purplerelay.com,50.1109,8.68213 +strfry.bonsai.com,37.8715,-122.273 +wot.yesnostr.net,50.9871,2.12554 +relay.lumina.rocks,49.0291,8.35695 +shu01.shugur.net,21.4902,39.2246 +nostrcheck.me,43.6532,-79.3832 +nostr-relay.corb.net,38.8353,-104.822 +dev-nostr.bityacht.io,25.0797,121.234 +nostr.simplex.icu,51.5121,-0.0005238 +relay.magiccity.live,25.8128,-80.2377 +public.crostr.com,43.6532,-79.3832 +nostr.4rs.nl,49.0291,8.35696 +relay.jabato.space,52.52,13.405 +wot.nostr.net,43.6532,-79.3832 +fanfares.nostr1.com,40.7057,-74.0136 +relay.toastr.net,40.8054,-74.0241 +nostrelay.memory-art.xyz,43.6532,-79.3832 +nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 +shu02.shugur.net,21.4902,39.2246 +nostr.davidebtc.me,51.5072,-0.127586 +premium.primal.net,43.6532,-79.3832 +nostr.chaima.info,51.223,6.78245 +nostr.snowbla.de,60.1699,24.9384 +relay.credenso.cafe,43.3601,-80.3127 +wot.soundhsa.com,33.1384,-95.6011 +nproxy.kristapsk.lv,60.1699,24.9384 +alien.macneilmediagroup.com,43.6532,-79.3832 +relay.goodmorningbitcoin.com,43.6532,-79.3832 +nostr.bitcoiner.social,39.1585,-94.5728 +orly.ft.hn,50.4754,12.3683 +relay.threenine.services,51.5524,-0.29686 +nostr.myshosholoza.co.za,52.3676,4.90414 From ab555f25f509c0f0d9b307853e6a836ced1f09cd Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 28 Dec 2025 06:07:12 +0000 Subject: [PATCH 04/10] Automated update of relay data - Sun Dec 28 06:07:12 UTC 2025 --- app/src/main/assets/nostr_relays.csv | 564 ++++++++++++++------------- 1 file changed, 288 insertions(+), 276 deletions(-) diff --git a/app/src/main/assets/nostr_relays.csv b/app/src/main/assets/nostr_relays.csv index 03e8c247..ab075fb4 100644 --- a/app/src/main/assets/nostr_relays.csv +++ b/app/src/main/assets/nostr_relays.csv @@ -1,283 +1,295 @@ Relay URL,Latitude,Longitude -relay.nostriot.com,41.5695,-83.9786 -relay.illuminodes.com,47.6061,-122.333 -relay.hook.cafe,43.6532,-79.3832 -relay.controller-ai.com,52.3563,4.95714 -relay.hasenpfeffr.com,39.0438,-77.4874 -nostr-relay.zimage.com,34.0549,-118.243 -relay.mattybs.lol,43.6532,-79.3832 -nostr.rblb.it,43.7094,10.6582 -relay.origin.land,35.6673,139.751 -nostr2.girino.org,43.6532,-79.3832 -nostr-relay.nextblockvending.com,47.2343,-119.853 -nostr.agentcampfire.com,52.3676,4.90414 -relay.olas.app,50.4754,12.3683 -soloco.nl,43.6532,-79.3832 -relay.usefusion.ai,38.7134,-78.1591 -nostr.lkjsxc.com,43.6532,-79.3832 -nostr.spicyz.io,43.6532,-79.3832 -relay.getsafebox.app,43.6532,-79.3832 -nostr.nodesmap.com,59.3327,18.0656 -nostr.88mph.life,51.5072,-0.127586 -relay04.lnfi.network,39.0997,-94.5786 -relay.uid.ovh,43.6532,-79.3832 -nostr.coincards.com,53.5501,-113.469 -srtrelay.c-stellar.net,43.6532,-79.3832 -purpura.cloud,43.6532,-79.3832 -nostream.breadslice.com,1.35208,103.82 -nostr.hifish.org,47.4043,8.57398 -nostr.data.haus,50.4754,12.3683 -relay.bullishbounty.com,43.6532,-79.3832 -nostr.superfriends.online,43.6532,-79.3832 -x.kojira.io,43.6532,-79.3832 -nostr.czas.top,50.1109,8.68213 -relay.seq1.net,43.6532,-79.3832 -nostr.luisschwab.net,43.6532,-79.3832 -temp.iris.to,43.6532,-79.3832 -nostr.azzamo.net,52.2633,21.0283 -orangepiller.org,60.1699,24.9384 -freeben666.fr,43.7221,7.15296 -strfry.elswa-dev.online,50.1109,8.68213 -wot.dtonon.com,43.6532,-79.3832 -relay.primal.net,43.6532,-79.3832 -schnorr.me,43.6532,-79.3832 -nostr.0x7e.xyz,47.4988,8.72369 -nostr.spaceshell.xyz,43.6532,-79.3832 -relay.0xchat.com,1.35208,103.82 -nostr.kalf.org,52.3676,4.90414 -relay.cypherflow.ai,48.8566,2.35222 -chat-relay.zap-work.com,43.6532,-79.3832 -relay01.lnfi.network,39.0997,-94.5786 -nostr.commonshub.brussels,49.4543,11.0746 -nostr.rikmeijer.nl,50.4754,12.3683 -nostr.calitabby.net,39.9268,-75.0246 -relay.snort.social,53.3498,-6.26031 -nostr.sathoarder.com,48.5734,7.75211 -strfry.openhoofd.nl,51.9229,4.40833 -yabu.me,35.6092,139.73 -relay.nostrhub.tech,49.0291,8.35696 -relay.mostro.network,40.8302,-74.1299 -bcast.seutoba.com.br,43.6532,-79.3832 -nostr.satstralia.com,64.1476,-21.9392 -nostr.21crypto.ch,47.5356,8.73209 -santo.iguanatech.net,40.8302,-74.1299 -notemine.io,52.2026,20.9397 -nostr.ps1829.com,33.8851,130.883 -relay.nostr.place,32.7767,-96.797 -alienos.libretechsystems.xyz,55.4724,9.87335 -nostr.bond,50.1109,8.68213 -relay.nostrdice.com,-33.8688,151.209 -nostr-verified.wellorder.net,45.5201,-122.99 -nostr-01.yakihonne.com,1.32123,103.695 strfry.shock.network,39.0438,-77.4874 -relay.evanverma.com,40.8302,-74.1299 -relay.davidebtc.me,51.5072,-0.127586 -nostr-relay.online,43.6532,-79.3832 -bitsat.molonlabe.holdings,51.4012,-1.3147 -relay.angor.io,48.1046,11.6002 -nostr.openhoofd.nl,51.9229,4.40833 -relay.smies.me,33.7501,-84.3885 -relay-testnet.k8s.layer3.news,37.3387,-121.885 -nostr.plantroon.com,50.1013,8.62643 -dev-relay.lnfi.network,39.0997,-94.5786 -nostr-relay.xbytez.io,50.6924,3.20113 -nostr.camalolo.com,24.1469,120.684 -relay-dev.satlantis.io,40.8302,-74.1299 -relay.artx.market,43.652,-79.3633 -wot.sovbit.host,64.1466,-21.9426 -relay.fundstr.me,42.3601,-71.0589 -nostr.hekster.org,37.3986,-121.964 -relay.libernet.app,43.6532,-79.3832 -nostr.n7ekb.net,47.4941,-122.294 -relay.thibautduchene.fr,43.6532,-79.3832 -nostr.mikoshi.de,47.74,12.0917 -relayone.soundhsa.com,33.1384,-95.6011 -relay.nosto.re,51.1792,5.89444 -relay.notoshi.win,13.311,101.112 -neuromancer.nettek.io,39.1429,-94.573 -nostr.ovia.to,43.6532,-79.3832 -relay.trustroots.org,43.6532,-79.3832 -relay.thebluepulse.com,49.4521,11.0767 -strfry.felixzieger.de,50.1013,8.62643 -relay.nostr.band,60.1699,24.9384 -relay2.angor.io,48.1046,11.6002 -relay.wavlake.com,41.2619,-95.8608 -ithurtswhenip.ee,51.223,6.78245 -shu05.shugur.net,48.8566,2.35222 -wot.shaving.kiwi,43.6532,-79.3832 wot.nostr.party,36.1627,-86.7816 -relay.bitcoinveneto.org,64.1466,-21.9426 -relay.siamdev.cc,13.9178,100.424 -relay.ngengine.org,43.6532,-79.3832 -relay.sigit.io,50.4754,12.3683 -relay.electriclifestyle.com,26.2897,-80.1293 -relay.nostar.org,43.6532,-79.3832 -nostr.oxtr.dev,50.4754,12.3683 -nostr.vulpem.com,49.4543,11.0746 -relay02.lnfi.network,39.0997,-94.5786 -relay.upleb.uk,51.9194,19.1451 -relay.bitcoinartclock.com,50.4754,12.3683 -nostrelay.circum.space,52.3676,4.90414 -relay.camelus.app,45.5201,-122.99 -nostr-relay.cbrx.io,43.6532,-79.3832 -espelho.girino.org,43.6532,-79.3832 -relay.lightning.pub,39.0438,-77.4874 -ribo.us.nostria.app,41.5868,-93.625 -relay.openfarmtools.org,60.1699,24.9384 -vault.iris.to,43.6532,-79.3832 -nostr.quali.chat,60.1699,24.9384 -relay.wolfcoil.com,35.6092,139.73 -adre.su,59.9311,30.3609 -relay.nostrzh.org,43.6532,-79.3832 -cyberspace.nostr1.com,40.7128,-74.006 -relay.divine.video,43.6532,-79.3832 -relay-arg.zombi.cloudrodion.com,1.35208,103.82 -relay.cosmicbolt.net,37.3986,-121.964 -black.nostrcity.club,48.8575,2.35138 -nostr-relay.psfoundation.info,39.0438,-77.4874 -relay.tagayasu.xyz,43.6715,-79.38 -nostr.now,36.55,139.733 -shu04.shugur.net,25.2604,55.2989 -relay.samt.st,40.8302,-74.1299 -relay03.lnfi.network,39.0997,-94.5786 -nostr-02.yakihonne.com,1.32123,103.695 -nostr.tac.lol,47.4748,-122.273 -theoutpost.life,64.1476,-21.9392 -relay.dwadziesciajeden.pl,52.2297,21.0122 -nostr.huszonegy.world,47.4979,19.0402 -relay.zombi.cloudrodion.com,48.8566,2.35222 -nr.yay.so,46.2126,6.1154 -offchain.pub,47.6743,-117.112 -relay.jeffg.fyi,43.6532,-79.3832 -relay.wavefunc.live,34.0362,-118.443 -relay.islandbitcoin.com,12.8498,77.6545 -nostr-relay.amethyst.name,39.0438,-77.4874 -inbox.azzamo.net,52.2633,21.0283 -nostr.tadryanom.me,43.6532,-79.3832 -relay5.bitransfer.org,43.6532,-79.3832 -nostr.tavux.tech,48.8575,2.35138 nostr.blankfors.se,60.1699,24.9384 -nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 -nos.xmark.cc,50.6924,3.20113 -relay-freeharmonypeople.space,38.7223,-9.13934 -nostr.mehdibekhtaoui.com,49.4939,-1.54813 -nostr-02.czas.top,51.2277,6.77346 -relay.puresignal.news,43.6532,-79.3832 -nostr.faultables.net,43.6532,-79.3832 -relay.satmaxt.xyz,43.6532,-79.3832 -relay.degmods.com,50.4754,12.3683 -nos.lol,50.4754,12.3683 -wheat.happytavern.co,43.6532,-79.3832 -relays.diggoo.com,43.6532,-79.3832 -relay.chakany.systems,43.6532,-79.3832 -wot.sudocarlos.com,51.5072,-0.127586 -relay.vrtmrz.net,43.6532,-79.3832 -bucket.coracle.social,37.7775,-122.397 -relay.damus.io,43.6532,-79.3832 -relay.npubhaus.com,43.6532,-79.3832 -relay.nuts.cash,34.0362,-118.443 -relay.ditto.pub,43.6532,-79.3832 -relay.agora.social,50.7383,15.0648 -librerelay.aaroniumii.com,43.6532,-79.3832 -ribo.eu.nostria.app,52.3676,4.90414 -vitor.nostr1.com,40.7057,-74.0136 -nostr-2.21crypto.ch,47.5356,8.73209 -relay.etch.social,41.2619,-95.8608 -nostr.noones.com,50.1109,8.68213 -nostrcheck.tnsor.network,43.6532,-79.3832 -nostr.overmind.lol,43.6532,-79.3832 -nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 -relay.coinos.io,43.6532,-79.3832 -relay.moinsen.com,50.4754,12.3683 -relay.letsfo.com,51.098,17.0321 -nostr-pub.wellorder.net,45.5201,-122.99 -relayone.geektank.ai,18.2148,-63.0574 -relay-rpi.edufeed.org,49.4521,11.0767 -relay.orangepill.ovh,49.1689,-0.358841 -relay.chorus.community,50.1109,8.68213 -ynostr.yael.at,60.1699,24.9384 -relay.agorist.space,52.3734,4.89406 -khatru.nostrver.se,51.1792,5.89444 -relay.binaryrobot.com,43.6532,-79.3832 -relay.zone667.com,60.1699,24.9384 -relay.javi.space,43.4633,11.8796 -nostr.roundrockbitcoiners.com,40.8054,-74.0241 -relay.minibolt.info,43.6532,-79.3832 -relay.nostr.wirednet.jp,34.706,135.493 -wot.dergigi.com,64.1476,-21.9392 -nostr-03.dorafactory.org,1.35208,103.82 -bitcoiner.social,39.1585,-94.5728 -prl.plus,42.6978,23.3246 -nostr.night7.space,50.4754,12.3683 -nostr.notribe.net,40.8302,-74.1299 -no.str.cr,9.92857,-84.0528 -relay.21e6.cz,50.7383,15.0648 -relay.bitcoindistrict.org,43.6532,-79.3832 -nostr.bilthon.dev,25.8128,-80.2377 -relay.endfiat.money,43.6532,-79.3832 -wot.nostr.place,32.7767,-96.797 -bcast.girino.org,43.6532,-79.3832 -nostr.thebiglake.org,32.71,-96.6745 -relay.satlantis.io,32.8769,-80.0114 -relay.btcforplebs.com,43.6532,-79.3832 -nostr.stakey.net,52.3676,4.90414 -relay.nostr-check.me,43.6532,-79.3832 -nostr.girino.org,43.6532,-79.3832 -nostr.rtvslawenia.com,49.4543,11.0746 -relay2.ngengine.org,43.6532,-79.3832 -pyramid.treegaze.com,43.6532,-79.3832 -articles.layer3.news,37.3387,-121.885 -relay.fountain.fm,39.0997,-94.5786 -relay.mccormick.cx,52.3563,4.95714 -relay.routstr.com,43.6532,-79.3832 -relay.arx-ccn.com,50.4754,12.3683 -nostr.tuckerbradford.com,43.663,-70.2569 -nostr.zoracle.org,45.6018,-121.185 -nostr.jerrynya.fun,31.2304,121.474 -relay.nostr.net,43.6532,-79.3832 -relay.holzeis.me,43.6532,-79.3832 -relay.wellorder.net,45.5201,-122.99 -relay.guggero.org,47.3769,8.54169 -nostr.red5d.dev,43.6532,-79.3832 -nostr-01.uid.ovh,43.6532,-79.3832 -r.bitcoinhold.net,43.6532,-79.3832 -relay.nostrhub.fr,48.1045,11.6004 -wot.sebastix.social,51.1792,5.89444 -nostr.mom,50.4754,12.3683 -nos4smartnkind.tech,40.1872,44.5152 -nostr.casa21.space,43.6532,-79.3832 -relay.nostrcheck.me,43.6532,-79.3832 -kotukonostr.onrender.com,37.7775,-122.397 -nostr-dev.wellorder.net,45.5201,-122.99 -purplerelay.com,50.1109,8.68213 -strfry.bonsai.com,37.8715,-122.273 -wot.yesnostr.net,50.9871,2.12554 -relay.lumina.rocks,49.0291,8.35695 -shu01.shugur.net,21.4902,39.2246 -nostrcheck.me,43.6532,-79.3832 -nostr-relay.corb.net,38.8353,-104.822 -dev-nostr.bityacht.io,25.0797,121.234 +nostr.now,36.55,139.733 nostr.simplex.icu,51.5121,-0.0005238 -relay.magiccity.live,25.8128,-80.2377 -public.crostr.com,43.6532,-79.3832 -nostr.4rs.nl,49.0291,8.35696 -relay.jabato.space,52.52,13.405 -wot.nostr.net,43.6532,-79.3832 -fanfares.nostr1.com,40.7057,-74.0136 -relay.toastr.net,40.8054,-74.0241 -nostrelay.memory-art.xyz,43.6532,-79.3832 -nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 -shu02.shugur.net,21.4902,39.2246 -nostr.davidebtc.me,51.5072,-0.127586 -premium.primal.net,43.6532,-79.3832 -nostr.chaima.info,51.223,6.78245 -nostr.snowbla.de,60.1699,24.9384 -relay.credenso.cafe,43.3601,-80.3127 -wot.soundhsa.com,33.1384,-95.6011 -nproxy.kristapsk.lv,60.1699,24.9384 -alien.macneilmediagroup.com,43.6532,-79.3832 -relay.goodmorningbitcoin.com,43.6532,-79.3832 -nostr.bitcoiner.social,39.1585,-94.5728 -orly.ft.hn,50.4754,12.3683 relay.threenine.services,51.5524,-0.29686 +relay.barine.co,43.6532,-79.3832 +theoutpost.life,64.1476,-21.9392 +purplerelay.com,50.1109,8.68213 +nostrue.com,40.8054,-74.0241 +relay-arg.zombi.cloudrodion.com,1.35208,103.82 +shu02.shugur.net,21.4902,39.2246 +relayone.geektank.ai,18.2148,-63.0574 +relay03.lnfi.network,39.0997,-94.5786 +soloco.nl,43.6532,-79.3832 +relay-testnet.k8s.layer3.news,37.3387,-121.885 +nostr.azzamo.net,52.2633,21.0283 +nostr.red5d.dev,43.6532,-79.3832 +nostr.thebiglake.org,32.71,-96.6745 +nostr.tadryanom.me,43.6532,-79.3832 +schnorr.me,43.6532,-79.3832 +ithurtswhenip.ee,51.223,6.78245 +orly.ft.hn,50.4754,12.3683 +relay02.lnfi.network,39.0997,-94.5786 +relay.nosto.re,51.1792,5.89444 +strfry.openhoofd.nl,51.9229,4.40833 +relays.diggoo.com,43.6532,-79.3832 +relay.nostrhub.tech,49.0291,8.35696 +relay.artx.market,43.652,-79.3633 +relay.sigit.io,50.4754,12.3683 +nostr-relay.psfoundation.info,39.0438,-77.4874 +wot.brightbolt.net,47.6735,-116.781 +relay.bitcoinartclock.com,50.4754,12.3683 +khatru.nostrver.se,51.1792,5.89444 +relay.cosmicbolt.net,37.3986,-121.964 +adre.su,59.9311,30.3609 +nostrelay.memory-art.xyz,43.6532,-79.3832 +temp.iris.to,43.6532,-79.3832 +nproxy.kristapsk.lv,60.1699,24.9384 +relay.ngengine.org,43.6532,-79.3832 +relay.puresignal.news,43.6532,-79.3832 +nostr.stakey.net,52.3676,4.90414 +nostr.commonshub.brussels,49.4543,11.0746 +wot.shaving.kiwi,43.6532,-79.3832 +espelho.girino.org,43.6532,-79.3832 +relay.thibautduchene.fr,43.6532,-79.3832 +nostr-relay.corb.net,38.8353,-104.822 +wot.soundhsa.com,33.1384,-95.6011 +relay.jabato.space,52.52,13.405 +relay.credenso.cafe,43.3601,-80.3127 +relayone.soundhsa.com,33.1384,-95.6011 +relay.bitcoinveneto.org,64.1466,-21.9426 +relay.samt.st,40.8302,-74.1299 +relay.vrtmrz.net,43.6532,-79.3832 +nostr.data.haus,50.4754,12.3683 +relay.npubhaus.com,43.6532,-79.3832 +strfry.elswa-dev.online,50.1109,8.68213 +relay.wavefunc.live,34.0362,-118.443 +wot.sovbit.host,64.1466,-21.9426 +relay.smies.me,33.7501,-84.3885 +nostr.bilthon.dev,25.8128,-80.2377 +relay-fra.zombi.cloudrodion.com,48.8566,2.35222 +santo.iguanatech.net,40.8302,-74.1299 +prl.plus,42.6978,23.3246 +relay-freeharmonypeople.space,38.7223,-9.13934 +nostream.breadslice.com,1.35208,103.82 +nostr.notribe.net,40.8302,-74.1299 +relay.fountain.fm,39.0997,-94.5786 +orangepiller.org,60.1699,24.9384 +nostr.21crypto.ch,47.5356,8.73209 +nostr.camalolo.com,24.1469,120.684 +okn.czas.top,51.267,6.81738 +relay.wolfcoil.com,35.6092,139.73 +nostr.quali.chat,60.1699,24.9384 +nostr-relay.online,43.6532,-79.3832 +alienos.libretechsystems.xyz,55.4724,9.87335 +ribo.eu.nostria.app,52.3676,4.90414 +wot.yesnostr.net,50.9871,2.12554 +nostr.overmind.lol,43.6532,-79.3832 +relay.chakany.systems,43.6532,-79.3832 +relay.hasenpfeffr.com,39.0438,-77.4874 +nostrelites.org,41.8781,-87.6298 +strfry.bonsai.com,37.8715,-122.273 +relay.agora.social,50.7383,15.0648 +alien.macneilmediagroup.com,43.6532,-79.3832 +relay.getsafebox.app,43.6532,-79.3832 +relay.nuts.cash,34.0362,-118.443 +notemine.io,52.2026,20.9397 +relay.nostr.place,32.7767,-96.797 +relay.21e6.cz,50.7383,15.0648 +nostr.casa21.space,43.6532,-79.3832 +premium.primal.net,43.6532,-79.3832 +relay5.bitransfer.org,43.6532,-79.3832 +nostr.rblb.it,43.7094,10.6582 +relay.goodmorningbitcoin.com,43.6532,-79.3832 +relay.camelus.app,45.5201,-122.99 +relay.origin.land,35.6673,139.751 +relay.fr13nd5.com,52.5233,13.3426 +nos.lol,50.4754,12.3683 +wot.nostr.net,43.6532,-79.3832 +relay.javi.space,43.4633,11.8796 +relay2.ngengine.org,43.6532,-79.3832 +relay.angor.io,48.1046,11.6002 +pyramid.treegaze.com,43.6532,-79.3832 +relay.letsfo.com,52.2633,21.0283 +relay.nostrzh.org,43.6532,-79.3832 +nostr.hekster.org,37.3986,-121.964 +relay.0xchat.com,1.35208,103.82 +nostr.czas.top,50.1109,8.68213 +nostr.superfriends.online,43.6532,-79.3832 +hsuite-nostr-relay.hbarsuite.workers.dev,43.6532,-79.3832 +relay.mccormick.cx,52.3563,4.95714 +nostr.88mph.life,51.5072,-0.127586 +strfry.ymir.cloud,34.0965,-117.585 +nostr.lkjsxc.com,43.6532,-79.3832 +yabu.me,35.6092,139.73 +relay.chorus.community,50.1109,8.68213 +nostr-02.yakihonne.com,1.32123,103.695 +neuromancer.nettek.io,39.1429,-94.573 +relay04.lnfi.network,39.0997,-94.5786 +nostr-relay.amethyst.name,39.0438,-77.4874 +nostrcheck.tnsor.network,43.6532,-79.3832 +wot.nostr.place,32.7767,-96.797 +cyberspace.nostr1.com,40.7057,-74.0136 +relay.guggero.org,47.3769,8.54169 +nostr.calitabby.net,39.9268,-75.0246 +x.kojira.io,43.6532,-79.3832 +nostr.agentcampfire.com,52.3676,4.90414 +relay.bullishbounty.com,43.6532,-79.3832 +relay.nostrverse.net,43.6532,-79.3832 +nostr.robosats.org,64.1476,-21.9392 +nostr-verified.wellorder.net,45.5201,-122.99 +nostr.huszonegy.world,47.4979,19.0402 +relay.cypherflow.ai,48.8566,2.35222 +nostr-relay.xbytez.io,50.6924,3.20113 +nostr.faultables.net,43.6532,-79.3832 +relay.libernet.app,43.6532,-79.3832 +relay.magiccity.live,25.8128,-80.2377 +relay.wellorder.net,45.5201,-122.99 +black.nostrcity.club,48.8575,2.35138 +relay.jeffg.fyi,43.6532,-79.3832 +freeben666.fr,43.7221,7.15296 +relay.nostr.wirednet.jp,34.706,135.493 +nostrelay.circum.space,52.3676,4.90414 +relay.islandbitcoin.com,12.8498,77.6545 +nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 +relay.nostriot.com,41.5695,-83.9786 +relayrs.notoshi.win,43.6532,-79.3832 +nostr-pub.wellorder.net,45.5201,-122.99 +nostr.vulpem.com,49.4543,11.0746 +nostr.sathoarder.com,48.5734,7.75211 +wheat.happytavern.co,43.6532,-79.3832 +relay.nostr.net,43.6532,-79.3832 +bcast.girino.org,43.6532,-79.3832 +nostr-02.czas.top,51.2277,6.77346 +vault.iris.to,43.6532,-79.3832 +ynostr.yael.at,60.1699,24.9384 +nostr.nodesmap.com,59.3327,18.0656 +nostr.n7ekb.net,47.4941,-122.294 +relayb.uid.ovh,43.6532,-79.3832 +shu05.shugur.net,48.8566,2.35222 +dev-relay.lnfi.network,39.0997,-94.5786 +relay.bitcoindistrict.org,43.6532,-79.3832 +nostr.spicyz.io,43.6532,-79.3832 +nostr.0x7e.xyz,47.4988,8.72369 +relay.dwadziesciajeden.pl,52.2297,21.0122 +relay.zone667.com,60.1699,24.9384 +nostr-dev.wellorder.net,45.5201,-122.99 +nos.xmark.cc,50.6924,3.20113 +relay.etch.social,41.2619,-95.8608 +nostr.na.social,43.6532,-79.3832 +relay.orangepill.ovh,49.1689,-0.358841 +relay.olas.app,50.4754,12.3683 +relay.holzeis.me,43.6532,-79.3832 +relay2.angor.io,48.1046,11.6002 +relay.degmods.com,50.4754,12.3683 +vitor.nostr1.com,40.7128,-74.006 +relay.btcforplebs.com,43.6532,-79.3832 +nostr.luisschwab.net,43.6532,-79.3832 +relay.moinsen.com,50.4754,12.3683 +czas.xyz,48.8566,2.35222 +nostr.bitcoiner.social,39.1585,-94.5728 +nostr.mehdibekhtaoui.com,49.4939,-1.54813 +inbox.azzamo.net,52.2633,21.0283 +nostr.ovia.to,43.6532,-79.3832 nostr.myshosholoza.co.za,52.3676,4.90414 +fenrir-s.notoshi.win,43.6532,-79.3832 +relay-rpi.edufeed.org,49.4521,11.0767 +chat-relay.zap-work.com,43.6532,-79.3832 +nostr.bond,50.1109,8.68213 +relay01.lnfi.network,39.0997,-94.5786 +relay.seq1.net,43.6532,-79.3832 +nostr.rikmeijer.nl,50.4754,12.3683 +offchain.pub,47.6743,-117.112 +nostr.spaceshell.xyz,43.6532,-79.3832 +nos4smartnkind.tech,40.1872,44.5152 +kotukonostr.onrender.com,37.7775,-122.397 +nostr.ps1829.com,33.8851,130.883 +relay.lightning.pub,39.0438,-77.4874 +nostr-relay.gateway.in.th,15.2634,100.344 +relay.thebluepulse.com,49.4521,11.0767 +relay.malxte.de,52.52,13.405 +relay.usefusion.ai,38.7134,-78.1591 +nostr-relay.cbrx.io,43.6532,-79.3832 +shu01.shugur.net,21.4902,39.2246 +nostr.jerrynya.fun,31.2304,121.474 +dev-nostr.bityacht.io,25.0797,121.234 +bitsat.molonlabe.holdings,51.4012,-1.3147 +relay.primal.net,43.6532,-79.3832 +relay.wavlake.com,41.2619,-95.8608 +nostr-relay.nextblockvending.com,47.2343,-119.853 +v-relay.d02.vrtmrz.net,34.6937,135.502 +nostr.mikoshi.de,47.74,12.0917 +nostr.coincards.com,53.5501,-113.469 +relay.snort.social,53.3498,-6.26031 +bitcoiner.social,39.1585,-94.5728 +nostr.noones.com,50.1109,8.68213 +wot.dergigi.com,64.1476,-21.9392 +relay.lumina.rocks,49.0291,8.35695 +nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 +nostr.snowbla.de,60.1699,24.9384 +strfry.felixzieger.de,50.1013,8.62643 +relay.satlantis.io,32.8769,-80.0114 +relay-dev.satlantis.io,40.8302,-74.1299 +nostr.davidebtc.me,51.5072,-0.127586 +relay.mattybs.lol,43.6532,-79.3832 +relay.fundstr.me,42.3601,-71.0589 +relay.tagayasu.xyz,43.6715,-79.38 +nostr-relay.zimage.com,34.0549,-118.243 +nostrcheck.me,43.6532,-79.3832 +bucket.coracle.social,37.7775,-122.397 +relay.siamdev.cc,13.9178,100.424 +r.bitcoinhold.net,43.6532,-79.3832 +skeme.vanderwarker.family,40.8218,-74.45 +articles.layer3.news,37.3387,-121.885 +no.str.cr,9.92857,-84.0528 +srtrelay.c-stellar.net,43.6532,-79.3832 +relay.comcomponent.com,34.7062,135.493 +relay.illuminodes.com,47.6061,-122.333 +nostr.openhoofd.nl,51.9229,4.40833 +nostr.plantroon.com,50.1013,8.62643 +slick.mjex.me,39.048,-77.4817 +relay.minibolt.info,43.6532,-79.3832 +nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 +relay.nostrdice.com,-33.8688,151.209 +wot.dtonon.com,43.6532,-79.3832 +shu04.shugur.net,25.2604,55.2989 +nostr.tavux.tech,48.8575,2.35138 +nostr-02.uid.ovh,43.6532,-79.3832 +relay.nostrcheck.me,43.6532,-79.3832 +relay.nsnip.io,60.1699,24.9384 +relay.toastr.net,40.8054,-74.0241 +relay.divine.video,43.6532,-79.3832 +nostr.4rs.nl,49.0291,8.35696 +wot.sebastix.social,51.1792,5.89444 +relay.openfarmtools.org,60.1699,24.9384 +relay.damus.io,43.6532,-79.3832 +purpura.cloud,43.6532,-79.3832 +wot.sudocarlos.com,51.5072,-0.127586 +relay.arx-ccn.com,50.4754,12.3683 +nostr.zoracle.org,45.6018,-121.185 +nostr.tac.lol,47.4748,-122.273 +relay.coinos.io,43.6532,-79.3832 +nostr.rtvslawenia.com,49.4543,11.0746 +relay.davidebtc.me,51.5072,-0.127586 +ribo.us.nostria.app,41.5868,-93.625 +relay.upleb.uk,51.9194,19.1451 +librerelay.aaroniumii.com,43.6532,-79.3832 +relay.endfiat.money,43.6532,-79.3832 +relay.nostar.org,43.6532,-79.3832 +relay.electriclifestyle.com,26.2897,-80.1293 +relay.nostrhub.fr,48.1045,11.6004 +relay.agorist.space,52.3734,4.89406 +freelay.sovbit.host,64.1476,-21.9392 +nostr.hifish.org,47.4043,8.57398 +nostr-01.yakihonne.com,1.32123,103.695 +relay.routstr.com,43.6532,-79.3832 +nr.yay.so,46.2126,6.1154 +bcast.seutoba.com.br,43.6532,-79.3832 +fanfares.nostr1.com,40.7128,-74.006 +nostr.girino.org,43.6532,-79.3832 +nostr2.girino.org,43.6532,-79.3832 +relay.notoshi.win,13.311,101.112 +nostrja-kari.heguro.com,43.6532,-79.3832 +relay.mostro.network,40.8302,-74.1299 +satsage.xyz,37.3986,-121.964 +relay.evanverma.com,40.8302,-74.1299 +nostr-2.21crypto.ch,47.5356,8.73209 +relay.mitchelltribe.com,39.0438,-77.4874 +relaynostr.breadslice.com,43.6532,-79.3832 +nostr.chaima.info,51.223,6.78245 +nostr.mom,50.4754,12.3683 +relay.nostr-check.me,43.6532,-79.3832 +relay.ditto.pub,43.6532,-79.3832 From 903a4584a8f72988475a56bfcd604daf7aad99a0 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Fri, 2 Jan 2026 16:52:06 +0700 Subject: [PATCH 05/10] Prevent quit notification from reappearing (#530) * shutdown sequence * Prevent quit notification from reappearing * Restrict force-finish broadcast * Cancel quit shutdown on relaunch --- app/src/main/AndroidManifest.xml | 6 ++++ .../java/com/bitchat/android/MainActivity.kt | 35 +++++++++++++++++++ .../android/service/AppShutdownCoordinator.kt | 32 +++++++++++++++-- .../android/service/MeshForegroundService.kt | 19 ++++++++++ .../com/bitchat/android/util/AppConstants.kt | 2 ++ 5 files changed, 92 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b228fd34..f4ca2b89 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,8 @@ + + @@ -46,6 +48,10 @@ + + = 33) { + registerReceiver( + forceFinishReceiver, + filter, + com.bitchat.android.util.AppConstants.UI.PERMISSION_FORCE_FINISH, + null, + android.content.Context.RECEIVER_NOT_EXPORTED + ) + } else { + @Suppress("DEPRECATION") + registerReceiver( + forceFinishReceiver, + filter, + com.bitchat.android.util.AppConstants.UI.PERMISSION_FORCE_FINISH, + null + ) + } + // Check if this is a quit request from the notification if (intent.getBooleanExtra("ACTION_QUIT_APP", false)) { android.util.Log.d("MainActivity", "Quit request received in onCreate, finishing activity") finish() return } + + com.bitchat.android.service.AppShutdownCoordinator.cancelPendingShutdown() // Enable edge-to-edge display for modern Android look enableEdgeToEdge() @@ -646,6 +677,8 @@ class MainActivity : OrientationAwareActivity() { finish() return } + + com.bitchat.android.service.AppShutdownCoordinator.cancelPendingShutdown() // Handle notification intents when app is already running if (mainViewModel.onboardingState.value == OnboardingState.COMPLETE) { @@ -759,6 +792,8 @@ class MainActivity : OrientationAwareActivity() { override fun onDestroy() { super.onDestroy() + try { unregisterReceiver(forceFinishReceiver) } catch (_: Exception) { } + // Cleanup location status manager try { locationStatusManager.cleanup() diff --git a/app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt b/app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt index d4e00104..1c3abaf9 100644 --- a/app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt +++ b/app/src/main/java/com/bitchat/android/service/AppShutdownCoordinator.kt @@ -9,10 +9,13 @@ import com.bitchat.android.net.TorMode import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.Job import kotlinx.coroutines.async import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withTimeoutOrNull +import java.util.concurrent.atomic.AtomicLong /** * Coordinates a full application shutdown: @@ -24,6 +27,15 @@ import kotlinx.coroutines.withTimeoutOrNull */ object AppShutdownCoordinator { private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob()) + private val shutdownToken = AtomicLong(0L) + @Volatile + private var shutdownJob: Job? = null + + fun cancelPendingShutdown() { + shutdownToken.incrementAndGet() + shutdownJob?.cancel() + shutdownJob = null + } fun requestFullShutdownAndKill( app: Application, @@ -32,7 +44,16 @@ object AppShutdownCoordinator { stopForeground: () -> Unit, stopService: () -> Unit ) { - scope.launch { + val token = shutdownToken.incrementAndGet() + shutdownJob?.cancel() + val job = scope.launch { + // Signal UI to finish gracefully before we kill the process + try { + val intent = android.content.Intent(com.bitchat.android.util.AppConstants.UI.ACTION_FORCE_FINISH) + .setPackage(app.packageName) + app.sendBroadcast(intent, com.bitchat.android.util.AppConstants.UI.PERMISSION_FORCE_FINISH) + } catch (_: Exception) { } + // Stop mesh (best-effort) try { mesh?.stopServices() } catch (_: Exception) { } @@ -56,12 +77,19 @@ object AppShutdownCoordinator { } // Stop the service itself + if (!isActive || shutdownToken.get() != token) return@launch try { stopService() } catch (_: Exception) { } // Hard kill the app process + if (!isActive || shutdownToken.get() != token) return@launch try { Process.killProcess(Process.myPid()) } catch (_: Exception) { } try { System.exit(0) } catch (_: Exception) { } } + shutdownJob = job + job.invokeOnCompletion { + if (shutdownJob === job) { + shutdownJob = null + } + } } } - diff --git a/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt b/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt index 7510fa06..e92274f8 100644 --- a/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt +++ b/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt @@ -115,6 +115,7 @@ class MeshForegroundService : Service() { private val serviceJob = Job() private val scope = CoroutineScope(Dispatchers.Default + serviceJob) private var isInForeground: Boolean = false + private var isShuttingDown: Boolean = false override fun onCreate() { super.onCreate() @@ -133,6 +134,13 @@ class MeshForegroundService : Service() { } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + if (isShuttingDown && intent?.action == ACTION_START) { + AppShutdownCoordinator.cancelPendingShutdown() + isShuttingDown = false + } + if (isShuttingDown && intent?.action != ACTION_QUIT) { + return START_NOT_STICKY + } when (intent?.action) { ACTION_STOP -> { // Stop FGS and mesh cleanly @@ -145,6 +153,12 @@ class MeshForegroundService : Service() { return START_NOT_STICKY } ACTION_QUIT -> { + isShuttingDown = true + updateJob?.cancel() + updateJob = null + try { stopForeground(true) } catch (_: Exception) { } + notificationManager.cancel(NOTIFICATION_ID) + isInForeground = false // Fully stop all background activity, stop Tor (without changing setting), then kill the app AppShutdownCoordinator.requestFullShutdownAndKill( app = application, @@ -208,6 +222,7 @@ class MeshForegroundService : Service() { } private fun ensureMeshStarted() { + if (isShuttingDown) return if (!hasBluetoothPermissions()) return try { android.util.Log.d("MeshForegroundService", "Ensuring mesh service is started") @@ -218,6 +233,10 @@ class MeshForegroundService : Service() { } private fun updateNotification(force: Boolean) { + if (isShuttingDown) { + notificationManager.cancel(NOTIFICATION_ID) + return + } val count = meshService?.getActivePeerCount() ?: 0 val notification = buildNotification(count) if (MeshServicePreferences.isBackgroundEnabled(true) && hasAllRequiredPermissions()) { diff --git a/app/src/main/java/com/bitchat/android/util/AppConstants.kt b/app/src/main/java/com/bitchat/android/util/AppConstants.kt index 9881cc2f..ca031df9 100644 --- a/app/src/main/java/com/bitchat/android/util/AppConstants.kt +++ b/app/src/main/java/com/bitchat/android/util/AppConstants.kt @@ -115,6 +115,8 @@ object AppConstants { const val MESSAGE_DEDUP_TIMEOUT_MS: Long = 30_000L const val SYSTEM_EVENT_DEDUP_TIMEOUT_MS: Long = 5_000L const val ACTIVE_PEERS_NOTIFICATION_INTERVAL_MS: Long = 300_000L + const val ACTION_FORCE_FINISH: String = "com.bitchat.android.ACTION_FORCE_FINISH" + const val PERMISSION_FORCE_FINISH: String = "com.bitchat.android.permission.FORCE_FINISH" } object Media { From 0c7505b588b38b14f5b674ef6ec4d286cdb0f5c4 Mon Sep 17 00:00:00 2001 From: aidenvalue Date: Sat, 3 Jan 2026 17:31:20 +0100 Subject: [PATCH 06/10] fix: wifi aware socket binding (#533) * wifi aware wip * wifi aware wip * starting to work * werk * dms work * wip * fix(wifi-aware): use bindSocket and scoped IPv6 instead of bindProcessToNetwork * Merge branch 'upstream/main' into fix/wifi-aware-socket-binding * Fix Wi-Fi Aware connectivity and UI integration post-merge - Replace bindProcessToNetwork with bindSocket for VPN compatibility. - Implement Scoped IPv6 address resolution (aware0) for mesh routing. - Bridge Wi-Fi Aware incoming messages to AppStateStore for UI visibility. - Fix syntax errors and variable name conflicts in Debug UI. * Enhance Wi-Fi Aware robustness and debug UI display - Clean up transport resources (sockets, server sockets, network callbacks) immediately on peer disconnection. - Implement resolveScopedAddress to show scoped IPv6 (e.g., %aware0) in Debug UI. - Fix Map type mismatch warning in ChatViewModel bridge. - Filter self-ID from peer cleanup tables to prevent recursive self-removal. * Share GossipSyncManager across transports to prevent redundant message synchronization - Registered BluetoothMeshService's GossipSyncManager as a singleton in MeshServiceHolder. - Modified WifiAwareMeshService to use the shared GossipSyncManager if available. - Added background cleanup for peer mappings on socket disconnection. - Fixed Kotlin type mismatch during nickname map merging. * Restore VPN acquisition logic and improve peer cleanup - Revert removal of NET_CAPABILITY_NOT_VPN to allow hardware handle acquisition while VPN is active. - Refactor handlePeerDisconnection to more reliably cleanup initial and routed IDs. - Switch cleanup logging to debug level to reduce log noise. --------- Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com> Co-authored-by: aidenvalue <> --- app/src/main/AndroidManifest.xml | 9 + .../com/bitchat/android/BitchatApplication.kt | 5 + .../java/com/bitchat/android/MainActivity.kt | 57 +- .../android/mesh/BluetoothMeshService.kt | 6 +- .../onboarding/OnboardingCoordinator.kt | 1 + .../onboarding/PermissionExplanationScreen.kt | 2 + .../android/onboarding/PermissionManager.kt | 20 + .../android/service/MeshServiceHolder.kt | 6 + .../bitchat/android/services/MessageRouter.kt | 17 +- .../com/bitchat/android/ui/ChatViewModel.kt | 24 +- .../bitchat/android/ui/MediaSendingManager.kt | 2 + .../bitchat/android/ui/MeshDelegateHandler.kt | 5 +- .../bitchat/android/ui/SidebarComponents.kt | 21 +- .../ui/debug/DebugPreferenceManager.kt | 27 +- .../android/ui/debug/DebugSettingsManager.kt | 46 + .../android/ui/debug/DebugSettingsSheet.kt | 98 +- .../android/wifi-aware/WifiAwareController.kt | 116 ++ .../wifi-aware/WifiAwareMeshService.kt | 1277 +++++++++++++++++ 18 files changed, 1722 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt create mode 100644 app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4ca2b89..e79fa8eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + @@ -19,6 +20,12 @@ + + + + + + @@ -47,6 +54,8 @@ + + + val svc = com.bitchat.android.wifiaware.WifiAwareController.getService() + if (running && svc != null) { + svc.delegate = object : com.bitchat.android.wifiaware.WifiAwareMeshDelegate { + override fun didReceiveMessage(message: com.bitchat.android.model.BitchatMessage) { + if (message.isPrivate) { + message.senderPeerID?.let { pid -> com.bitchat.android.services.AppStateStore.addPrivateMessage(pid, message) } + } else if (message.channel != null) { + com.bitchat.android.services.AppStateStore.addChannelMessage(message.channel, message) + } else { + com.bitchat.android.services.AppStateStore.addPublicMessage(message) + } + chatViewModel.didReceiveMessage(message) + } + override fun didUpdatePeerList(peers: List) { + chatViewModel.didUpdatePeerList(peers) + } + override fun didReceiveChannelLeave(channel: String, fromPeer: String) { + chatViewModel.didReceiveChannelLeave(channel, fromPeer) + } + override fun didReceiveDeliveryAck(messageID: String, recipientPeerID: String) { + chatViewModel.didReceiveDeliveryAck(messageID, recipientPeerID) + } + override fun didReceiveReadReceipt(messageID: String, recipientPeerID: String) { + chatViewModel.didReceiveReadReceipt(messageID, recipientPeerID) + } + override fun decryptChannelMessage(encryptedContent: ByteArray, channel: String): String? { + return chatViewModel.decryptChannelMessage(encryptedContent, channel) + } + override fun getNickname(): String? { + return chatViewModel.getNickname() + } + override fun isFavorite(peerID: String): Boolean { + return try { + com.bitchat.android.favorites.FavoritesPersistenceService.shared.getFavoriteStatus(peerID)?.isMutual == true + } catch (_: Exception) { false } + } + } + } + } + } + } // Only start onboarding process if we're in the initial CHECKING state // This prevents restarting onboarding on configuration changes @@ -347,6 +395,12 @@ class MainActivity : OrientationAwareActivity() { bluetoothStatusManager.logBluetoothStatus() mainViewModel.updateBluetoothStatus(bluetoothStatusManager.checkBluetoothStatus()) + val bleRequired = try { com.bitchat.android.ui.debug.DebugPreferenceManager.getBleEnabled(true) } catch (_: Exception) { true } + if (!bleRequired) { + // Skip BLE checks entirely when BLE is disabled in debug settings + checkLocationAndProceed() + return + } when (mainViewModel.bluetoothStatus.value) { BluetoothStatus.ENABLED -> { // Bluetooth is enabled, check location services next @@ -513,8 +567,9 @@ class MainActivity : OrientationAwareActivity() { else -> BatteryOptimizationStatus.ENABLED } + val bleRequired2 = try { com.bitchat.android.ui.debug.DebugPreferenceManager.getBleEnabled(true) } catch (_: Exception) { true } when { - currentBluetoothStatus != BluetoothStatus.ENABLED -> { + bleRequired2 && currentBluetoothStatus != BluetoothStatus.ENABLED -> { // Bluetooth still disabled, but now we have permissions to enable it Log.d("MainActivity", "Permissions granted, but Bluetooth still disabled. Showing Bluetooth enable screen.") mainViewModel.updateBluetoothStatus(currentBluetoothStatus) diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt index 3de48407..c48ce087 100644 --- a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt +++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt @@ -94,6 +94,9 @@ class BluetoothMeshService(private val context: Context) { } catch (_: Exception) { 0.01 } } ) + + // Register as shared instance for Wi-Fi Aware transport + com.bitchat.android.service.MeshServiceHolder.setGossipManager(gossipSyncManager) // Wire sync manager delegate gossipSyncManager.delegate = object : GossipSyncManager.Delegate { @@ -268,7 +271,8 @@ class BluetoothMeshService(private val context: Context) { override fun sendPacket(packet: BitchatPacket) { // Sign the packet before broadcasting val signedPacket = signPacketBeforeBroadcast(packet) - connectionManager.broadcastPacket(RoutedPacket(signedPacket)) + val routed = RoutedPacket(signedPacket) + connectionManager.broadcastPacket(routed) } override fun relayPacket(routed: RoutedPacket) { diff --git a/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt b/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt index 871cc892..ba4da701 100644 --- a/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt +++ b/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt @@ -209,6 +209,7 @@ class OnboardingCoordinator( return when { permission.contains("BLUETOOTH") -> "Bluetooth/Nearby Devices" permission.contains("LOCATION") -> "Location (for Bluetooth scanning)" + permission.contains("NEARBY_WIFI") -> "Nearby Wi‑Fi Devices (for Wi‑Fi Aware)" permission.contains("NOTIFICATION") -> "Notifications" else -> permission.substringAfterLast(".") } diff --git a/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt b/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt index 2b84aefa..c00f35f3 100644 --- a/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt +++ b/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.filled.Power import androidx.compose.material.icons.filled.Mic import androidx.compose.material.icons.filled.Security +import androidx.compose.material.icons.filled.Wifi import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Warning import androidx.compose.material3.* @@ -242,6 +243,7 @@ private fun getPermissionIcon(permissionType: PermissionType): ImageVector { PermissionType.PRECISE_LOCATION -> Icons.Filled.LocationOn PermissionType.MICROPHONE -> Icons.Filled.Mic PermissionType.NOTIFICATIONS -> Icons.Filled.Notifications + PermissionType.WIFI_AWARE -> Icons.Filled.Wifi PermissionType.BATTERY_OPTIMIZATION -> Icons.Filled.Power PermissionType.OTHER -> Icons.Filled.Settings } diff --git a/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt b/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt index ff0a160f..aedf85f8 100644 --- a/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt +++ b/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt @@ -67,6 +67,11 @@ class PermissionManager(private val context: Context) { Manifest.permission.ACCESS_FINE_LOCATION )) + // Wi‑Fi Aware: Android 13+ requires NEARBY_WIFI_DEVICES runtime permission + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + permissions.add(Manifest.permission.NEARBY_WIFI_DEVICES) + } + // Notification permission intentionally excluded to keep it optional return permissions @@ -177,6 +182,20 @@ class PermissionManager(private val context: Context) { ) ) + // Wi‑Fi Aware category (Android 13+) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + val wifiAwarePermissions = listOf(Manifest.permission.NEARBY_WIFI_DEVICES) + categories.add( + PermissionCategory( + type = PermissionType.WIFI_AWARE, + description = "Enable Wi‑Fi Aware to discover and connect to nearby bitchat users over Wi‑Fi.", + permissions = wifiAwarePermissions, + isGranted = wifiAwarePermissions.all { isPermissionGranted(it) }, + systemDescription = "Allow bitchat to discover nearby Wi‑Fi devices" + ) + ) + } + // Notifications category (if applicable) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { categories.add( @@ -262,6 +281,7 @@ enum class PermissionType(val nameValue: String) { PRECISE_LOCATION("Precise Location"), MICROPHONE("Microphone"), NOTIFICATIONS("Notifications"), + WIFI_AWARE("Wi‑Fi Aware"), BATTERY_OPTIMIZATION("Battery Optimization"), OTHER("Other") } diff --git a/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt b/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt index d271ab29..71dddb66 100644 --- a/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt +++ b/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt @@ -9,6 +9,12 @@ import com.bitchat.android.mesh.BluetoothMeshService */ object MeshServiceHolder { private const val TAG = "MeshServiceHolder" + @Volatile + var sharedGossipSyncManager: com.bitchat.android.sync.GossipSyncManager? = null + private set + + fun setGossipManager(mgr: com.bitchat.android.sync.GossipSyncManager) { sharedGossipSyncManager = mgr } + @Volatile var meshService: BluetoothMeshService? = null private set diff --git a/app/src/main/java/com/bitchat/android/services/MessageRouter.kt b/app/src/main/java/com/bitchat/android/services/MessageRouter.kt index 8166487e..53db2fa6 100644 --- a/app/src/main/java/com/bitchat/android/services/MessageRouter.kt +++ b/app/src/main/java/com/bitchat/android/services/MessageRouter.kt @@ -72,9 +72,15 @@ class MessageRouter private constructor( val hasMesh = mesh.getPeerInfo(toPeerID)?.isConnected == true val hasEstablished = mesh.hasEstablishedSession(toPeerID) + // Check Wi‑Fi Aware availability as a secondary transport + val aware = try { com.bitchat.android.wifiaware.WifiAwareController.getService() } catch (_: Exception) { null } + val hasAware = try { aware?.getPeerInfo(toPeerID)?.isConnected == true && aware.hasEstablishedSession(toPeerID) } catch (_: Exception) { false } if (hasMesh && hasEstablished) { Log.d(TAG, "Routing PM via mesh to ${toPeerID} msg_id=${messageID.take(8)}…") mesh.sendPrivateMessage(content, toPeerID, recipientNickname, messageID) + } else if (hasAware) { + Log.d(TAG, "Routing PM via Wi‑Fi Aware to ${toPeerID} msg_id=${messageID.take(8)}…") + aware?.sendPrivateMessage(content, toPeerID, recipientNickname, messageID) } else if (canSendViaNostr(toPeerID)) { Log.d(TAG, "Routing PM via Nostr to ${toPeerID.take(32)}… msg_id=${messageID.take(8)}…") nostr.sendPrivateMessage(content, toPeerID, recipientNickname, messageID) @@ -83,14 +89,21 @@ class MessageRouter private constructor( val q = outbox.getOrPut(toPeerID) { mutableListOf() } q.add(Triple(content, recipientNickname, messageID)) Log.d(TAG, "Initiating noise handshake after queueing PM for ${toPeerID.take(8)}…") - mesh.initiateNoiseHandshake(toPeerID) + if (hasMesh) mesh.initiateNoiseHandshake(toPeerID) else aware?.initiateNoiseHandshake(toPeerID) } } fun sendReadReceipt(receipt: ReadReceipt, toPeerID: String) { - if ((mesh.getPeerInfo(toPeerID)?.isConnected == true) && mesh.hasEstablishedSession(toPeerID)) { + val aware = try { com.bitchat.android.wifiaware.WifiAwareController.getService() } catch (_: Exception) { null } + val viaMesh = (mesh.getPeerInfo(toPeerID)?.isConnected == true) && mesh.hasEstablishedSession(toPeerID) + val viaAware = try { aware?.getPeerInfo(toPeerID)?.isConnected == true && aware.hasEstablishedSession(toPeerID) } catch (_: Exception) { false } + if (viaMesh) { Log.d(TAG, "Routing READ via mesh to ${toPeerID.take(8)}… id=${receipt.originalMessageID.take(8)}…") mesh.sendReadReceipt(receipt.originalMessageID, toPeerID, mesh.getPeerNicknames()[toPeerID] ?: mesh.myPeerID) + } else if (viaAware) { + Log.d(TAG, "Routing READ via Wi‑Fi Aware to ${toPeerID.take(8)}… id=${receipt.originalMessageID.take(8)}…") + val me = try { aware?.myPeerID } catch (_: Exception) { null } + aware?.sendReadReceipt(receipt.originalMessageID, toPeerID, me ?: "") } else { Log.d(TAG, "Routing READ via Nostr to ${toPeerID.take(8)}… id=${receipt.originalMessageID.take(8)}…") nostr.sendReadReceipt(receipt, toPeerID) diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt index 1196396d..22345923 100644 --- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt +++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt @@ -441,8 +441,9 @@ class ChatViewModel( state.getNicknameValue() ) } else { - // Default: route via mesh + // Default: route via mesh + Wi‑Fi Aware meshService.sendMessage(messageContent, mentions, channel) + try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(messageContent, mentions, channel) } catch (_: Exception) {} } }) return @@ -512,19 +513,23 @@ class ChatViewModel( state.getNicknameValue(), meshService.myPeerID, onEncryptedPayload = { encryptedData -> - // This would need proper mesh service integration + // Send encrypted payload announcement over both transports for reachability meshService.sendMessage(content, mentions, currentChannelValue) + try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, currentChannelValue) } catch (_: Exception) {} }, onFallback = { meshService.sendMessage(content, mentions, currentChannelValue) + try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, currentChannelValue) } catch (_: Exception) {} } ) } else { meshService.sendMessage(content, mentions, currentChannelValue) + try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, currentChannelValue) } catch (_: Exception) {} } } else { messageManager.addMessage(message) meshService.sendMessage(content, mentions, null) + try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, null) } catch (_: Exception) {} } } } @@ -647,16 +652,23 @@ class ChatViewModel( val fingerprints = privateChatManager.getAllPeerFingerprints() state.setPeerFingerprints(fingerprints) - val nicknames = meshService.getPeerNicknames() - state.setPeerNicknames(nicknames) + // Merge nicknames from BLE and Wi‑Fi Aware to display names for all peers + val bleNick = meshService.getPeerNicknames() + val awareNickRaw = try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.getPeerNicknamesMap() } catch (_: Exception) { null } + val mergedNick = if (awareNickRaw != null) bleNick + awareNickRaw.filter { it.value != null }.mapValues { it.value!! }.filterKeys { it !in bleNick || bleNick[it].isNullOrBlank() } else bleNick + state.setPeerNicknames(mergedNick) val rssiValues = meshService.getPeerRSSI() - state.setPeerRSSI(rssiValues) + val awareRssi = try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.getPeerRSSI() } catch (_: Exception) { null } + val mergedRssi = if (awareRssi != null) rssiValues + awareRssi.filterKeys { it !in rssiValues } else rssiValues + state.setPeerRSSI(mergedRssi) // Update directness per peer (driven by PeerManager state) try { val directMap = state.getConnectedPeersValue().associateWith { pid -> - meshService.getPeerInfo(pid)?.isDirectConnection == true + val ble = meshService.getPeerInfo(pid)?.isDirectConnection == true + val aware = try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.getPeerInfo(pid)?.isDirectConnection == true } catch (_: Exception) { false } + ble || aware } state.setPeerDirect(directMap) } catch (_: Exception) { } diff --git a/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt b/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt index a3def523..fc134a1b 100644 --- a/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt +++ b/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt @@ -210,6 +210,7 @@ class MediaSendingManager( Log.d(TAG, "📤 Calling meshService.sendFilePrivate to $toPeerID") meshService.sendFilePrivate(toPeerID, filePacket) + try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendFilePrivate(toPeerID, filePacket) } catch (_: Exception) {} Log.d(TAG, "✅ File send completed successfully") } @@ -264,6 +265,7 @@ class MediaSendingManager( Log.d(TAG, "📤 Calling meshService.sendFileBroadcast") meshService.sendFileBroadcast(filePacket) + try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendFileBroadcast(filePacket) } catch (_: Exception) {} Log.d(TAG, "✅ File broadcast completed successfully") } diff --git a/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt b/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt index a452616e..6e7d5d22 100644 --- a/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt +++ b/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt @@ -96,7 +96,10 @@ class MeshDelegateHandler( override fun didUpdatePeerList(peers: List) { coroutineScope.launch { - state.setConnectedPeers(peers) + // Merge peers from multiple transports to avoid flapping + val current = state.getConnectedPeersValue().toMutableSet() + current.addAll(peers) + state.setConnectedPeers(current.toList()) state.setIsConnected(peers.isNotEmpty()) notificationManager.showActiveUserNotification(peers) // Flush router outbox for any peers that just connected (and their noiseHex aliases) diff --git a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt index 4ab4360a..c504b9f9 100644 --- a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt +++ b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt @@ -576,9 +576,26 @@ private fun PeerItem( tint = Color.Gray ) } else { + val awareConnected by com.bitchat.android.wifiaware.WifiAwareController.connectedPeers.collectAsState() + val awareDiscovered by com.bitchat.android.wifiaware.WifiAwareController.discoveredPeers.collectAsState() + val isWifiDirect = awareConnected.containsKey(peerID) + val isBleDirect = isDirect + val icon = when { + isWifiDirect -> Icons.Filled.Wifi + isBleDirect -> Icons.Outlined.SettingsInputAntenna + // Routed: show Route icon; optionally prefer Wi‑Fi Aware if discovered there + awareDiscovered.contains(peerID) -> Icons.Filled.WifiTethering + else -> Icons.Filled.Route + } + val cd = when { + isWifiDirect -> "Direct Wi‑Fi Aware" + isBleDirect -> "Direct Bluetooth" + awareDiscovered.contains(peerID) -> "Routed over Wi‑Fi" + else -> "Routed" + } Icon( - imageVector = if (isDirect) Icons.Outlined.SettingsInputAntenna else Icons.Filled.Route, - contentDescription = if (isDirect) "Direct Bluetooth" else "Routed", + imageVector = icon, + contentDescription = cd, modifier = Modifier.size(16.dp), tint = colorScheme.onSurface.copy(alpha = 0.8f) ) diff --git a/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt b/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt index 04ad48a2..2d734c14 100644 --- a/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt +++ b/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt @@ -20,7 +20,10 @@ object DebugPreferenceManager { // GCS keys (no migration/back-compat) private const val KEY_GCS_MAX_BYTES = "gcs_max_filter_bytes" private const val KEY_GCS_FPR = "gcs_filter_fpr_percent" - // Removed: persistent notification toggle is now governed by MeshServicePreferences.isBackgroundEnabled + // Transport master toggles + private const val KEY_BLE_ENABLED = "ble_enabled" + private const val KEY_WIFI_AWARE_ENABLED = "wifi_aware_enabled" + private const val KEY_WIFI_AWARE_VERBOSE = "wifi_aware_verbose" private lateinit var prefs: SharedPreferences @@ -102,5 +105,25 @@ object DebugPreferenceManager { if (ready()) prefs.edit().putLong(KEY_GCS_FPR, java.lang.Double.doubleToRawLongBits(value)).apply() } - // No longer storing persistent notification in debug prefs. + // Transport toggles + fun getBleEnabled(default: Boolean = true): Boolean = + if (ready()) prefs.getBoolean(KEY_BLE_ENABLED, default) else default + + fun setBleEnabled(value: Boolean) { + if (ready()) prefs.edit().putBoolean(KEY_BLE_ENABLED, value).apply() + } + + fun getWifiAwareEnabled(default: Boolean = false): Boolean = + if (ready()) prefs.getBoolean(KEY_WIFI_AWARE_ENABLED, default) else default + + fun setWifiAwareEnabled(value: Boolean) { + if (ready()) prefs.edit().putBoolean(KEY_WIFI_AWARE_ENABLED, value).apply() + } + + fun getWifiAwareVerbose(default: Boolean = false): Boolean = + if (ready()) prefs.getBoolean(KEY_WIFI_AWARE_VERBOSE, default) else default + + fun setWifiAwareVerbose(value: Boolean) { + if (ready()) prefs.edit().putBoolean(KEY_WIFI_AWARE_VERBOSE, value).apply() + } } diff --git a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt index 77f6ce12..669331e6 100644 --- a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt +++ b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt @@ -36,6 +36,17 @@ class DebugSettingsManager private constructor() { private val _packetRelayEnabled = MutableStateFlow(true) val packetRelayEnabled: StateFlow = _packetRelayEnabled.asStateFlow() + // Master transport toggles + private val _bleEnabled = MutableStateFlow(true) + val bleEnabled: StateFlow = _bleEnabled.asStateFlow() + + private val _wifiAwareEnabled = MutableStateFlow(false) + val wifiAwareEnabled: StateFlow = _wifiAwareEnabled.asStateFlow() + + // Master transport toggles + private val _wifiAwareVerbose = MutableStateFlow(false) + val wifiAwareVerbose: StateFlow = _wifiAwareVerbose.asStateFlow() + // Visibility of the debug sheet; gates heavy work private val _debugSheetVisible = MutableStateFlow(false) val debugSheetVisible: StateFlow = _debugSheetVisible.asStateFlow() @@ -59,6 +70,10 @@ class DebugSettingsManager private constructor() { _maxConnectionsOverall.value = DebugPreferenceManager.getMaxConnectionsOverall(8) _maxServerConnections.value = DebugPreferenceManager.getMaxConnectionsServer(8) _maxClientConnections.value = DebugPreferenceManager.getMaxConnectionsClient(8) + // Transport toggles + _bleEnabled.value = DebugPreferenceManager.getBleEnabled(true) + _wifiAwareEnabled.value = DebugPreferenceManager.getWifiAwareEnabled(false) + _wifiAwareVerbose.value = DebugPreferenceManager.getWifiAwareVerbose(false) } catch (_: Exception) { // Preferences not ready yet; keep defaults. They will be applied on first change. } @@ -262,6 +277,27 @@ class DebugSettingsManager private constructor() { )) } + fun setBleEnabled(enabled: Boolean) { + DebugPreferenceManager.setBleEnabled(enabled) + _bleEnabled.value = enabled + addDebugMessage(DebugMessage.SystemMessage(if (enabled) "🟢 BLE enabled" else "🔴 BLE disabled")) + } + + fun setWifiAwareEnabled(enabled: Boolean) { + DebugPreferenceManager.setWifiAwareEnabled(enabled) + _wifiAwareEnabled.value = enabled + addDebugMessage(DebugMessage.SystemMessage(if (enabled) "🟢 Wi‑Fi Aware enabled" else "🔴 Wi‑Fi Aware disabled")) + try { + com.bitchat.android.wifiaware.WifiAwareController.setEnabled(enabled) + } catch (_: Exception) { } + } + + fun setWifiAwareVerbose(enabled: Boolean) { + DebugPreferenceManager.setWifiAwareVerbose(enabled) + _wifiAwareVerbose.value = enabled + addDebugMessage(DebugMessage.SystemMessage(if (enabled) "🔊 Wi‑Fi Aware verbose logging enabled" else "🔇 Wi‑Fi Aware verbose logging disabled")) + } + fun setMaxConnectionsOverall(value: Int) { val clamped = value.coerceIn(1, 32) DebugPreferenceManager.setMaxConnectionsOverall(clamped) @@ -319,6 +355,16 @@ class DebugSettingsManager private constructor() { fun updateConnectedDevices(devices: List) { _connectedDevices.value = devices } + + // Wi‑Fi Aware debug collections + private val _wifiAwareDiscovered = MutableStateFlow>(emptyMap()) // peerID->nickname + val wifiAwareDiscovered: StateFlow> = _wifiAwareDiscovered.asStateFlow() + + private val _wifiAwareConnected = MutableStateFlow>(emptyMap()) // peerID->ip + val wifiAwareConnected: StateFlow> = _wifiAwareConnected.asStateFlow() + + fun updateWifiAwareDiscovered(map: Map) { _wifiAwareDiscovered.value = map } + fun updateWifiAwareConnected(map: Map) { _wifiAwareConnected.value = map } fun updateRelayStats(stats: PacketRelayStats) { _relayStats.value = stats diff --git a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt index 4b9f983a..94781b31 100644 --- a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt +++ b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt @@ -10,6 +10,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Bluetooth +import androidx.compose.material.icons.filled.Wifi +import androidx.compose.material.icons.filled.WifiTethering import androidx.compose.material.icons.filled.BugReport import androidx.compose.material.icons.filled.Cancel import androidx.compose.material.icons.filled.Devices @@ -50,7 +52,7 @@ fun DebugSettingsSheet( val verboseLogging by manager.verboseLoggingEnabled.collectAsState() val gattServerEnabled by manager.gattServerEnabled.collectAsState() val gattClientEnabled by manager.gattClientEnabled.collectAsState() - val packetRelayEnabled by manager.packetRelayEnabled.collectAsState() + val packetRelayed by manager.packetRelayEnabled.collectAsState() val maxOverall by manager.maxConnectionsOverall.collectAsState() val maxServer by manager.maxServerConnections.collectAsState() val maxClient by manager.maxClientConnections.collectAsState() @@ -62,6 +64,12 @@ fun DebugSettingsSheet( val gcsMaxBytes by manager.gcsMaxBytes.collectAsState() val gcsFpr by manager.gcsFprPercent.collectAsState() val context = LocalContext.current + + val bleEnabled by manager.bleEnabled.collectAsState() + val wifiAwareEnabled by manager.wifiAwareEnabled.collectAsState() + val wifiAwareVerbose by manager.wifiAwareVerbose.collectAsState() + val wifiAwareDiscovered by manager.wifiAwareDiscovered.collectAsState() + val wifiAwareConnected by manager.wifiAwareConnected.collectAsState() // Persistent notification is now controlled solely by MeshServicePreferences.isBackgroundEnabled // Push live connected devices from mesh service whenever sheet is visible @@ -86,6 +94,15 @@ fun DebugSettingsSheet( ) } manager.updateConnectedDevices(devices) + // Also surface Wi‑Fi Aware status + try { + val ctrl = com.bitchat.android.wifiaware.WifiAwareController + val known = ctrl.knownPeers.value + val discovered = ctrl.discoveredPeers.value + val discoveredMap = discovered.associateWith { pid -> known[pid] ?: "" } + manager.updateWifiAwareDiscovered(discoveredMap) + manager.updateWifiAwareConnected(ctrl.connectedPeers.value) + } catch (_: Exception) { } kotlinx.coroutines.delay(1000) } } @@ -213,6 +230,46 @@ fun DebugSettingsSheet( } } + // Transport toggles (BLE + Wi‑Fi Aware) + item { + Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { + Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Icon(Icons.Filled.Devices, contentDescription = null, tint = Color(0xFF4CAF50)) + Text("Transports", fontFamily = FontFamily.Monospace, fontSize = 14.sp, fontWeight = FontWeight.Medium) + } + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Filled.Bluetooth, contentDescription = null, tint = Color(0xFF007AFF)) + Spacer(Modifier.width(8.dp)) + Text("BLE", fontFamily = FontFamily.Monospace, modifier = Modifier.weight(1f)) + Switch(checked = bleEnabled, onCheckedChange = { + manager.setBleEnabled(it) + scope.launch { + if (it) { + if (gattServerEnabled) meshService.connectionManager.startServer() + if (gattClientEnabled) meshService.connectionManager.startClient() + } else { + meshService.connectionManager.stopServer() + meshService.connectionManager.stopClient() + } + } + }) + } + Row(verticalAlignment = Alignment.CenterVertically) { + Icon(Icons.Filled.Wifi, contentDescription = null, tint = Color(0xFF9C27B0)) + Spacer(Modifier.width(8.dp)) + Text("Wi‑Fi Aware", fontFamily = FontFamily.Monospace, modifier = Modifier.weight(1f)) + Switch(checked = wifiAwareEnabled, onCheckedChange = { manager.setWifiAwareEnabled(it) }) + } + Row(verticalAlignment = Alignment.CenterVertically) { + Spacer(Modifier.width(24.dp)) + Text("Wi‑Fi Aware verbose", fontFamily = FontFamily.Monospace, modifier = Modifier.weight(1f)) + Switch(checked = wifiAwareVerbose, onCheckedChange = { manager.setWifiAwareVerbose(it) }) + } + } + } + } + // Packet relay controls and stats item { Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { @@ -223,7 +280,7 @@ fun DebugSettingsSheet( Icon(Icons.Filled.PowerSettingsNew, contentDescription = null, tint = Color(0xFFFF9500)) Text(stringResource(R.string.debug_packet_relay), fontFamily = FontFamily.Monospace, fontSize = 14.sp, fontWeight = FontWeight.Medium) Spacer(Modifier.weight(1f)) - Switch(checked = packetRelayEnabled, onCheckedChange = { manager.setPacketRelayEnabled(it) }) + Switch(checked = packetRelayed, onCheckedChange = { manager.setPacketRelayEnabled(it) }) } // Removed aggregate labels; we will show per-direction compact labels below titles // Toggle: overall vs per-connection vs per-peer @@ -472,6 +529,43 @@ fun DebugSettingsSheet( } } + // Wi‑Fi Aware controls and status + item { + Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { + Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Icon(Icons.Filled.WifiTethering, contentDescription = null, tint = Color(0xFF9C27B0)) + Text("Wi‑Fi Aware", fontFamily = FontFamily.Monospace, fontSize = 14.sp, fontWeight = FontWeight.Medium) + Spacer(Modifier.weight(1f)) + val running by com.bitchat.android.wifiaware.WifiAwareController.running.collectAsState() + Text(if (running) "running" else "stopped", fontFamily = FontFamily.Monospace, fontSize = 12.sp, color = colorScheme.onSurface.copy(alpha = 0.7f)) + } + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + AssistChip(onClick = { com.bitchat.android.wifiaware.WifiAwareController.startIfPossible() }, label = { Text("Start") }) + AssistChip(onClick = { com.bitchat.android.wifiaware.WifiAwareController.stop() }, label = { Text("Stop") }) + AssistChip(onClick = { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendBroadcastAnnounce() }, label = { Text("Announce") }) + } + Text("Discovered: ${wifiAwareDiscovered.size}", fontFamily = FontFamily.Monospace, fontSize = 12.sp) + if (wifiAwareDiscovered.isEmpty()) { + Text("No discoveries yet", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.6f)) + } else { + wifiAwareDiscovered.entries.take(50).forEach { (peer, nick) -> + Text("• ${if (nick.isBlank()) peer.take(8) + "…" else nick} (${peer.take(8)}…) ", fontFamily = FontFamily.Monospace, fontSize = 12.sp) + } + } + Divider() + Text("Connected: ${wifiAwareConnected.size}", fontFamily = FontFamily.Monospace, fontSize = 12.sp) + if (wifiAwareConnected.isEmpty()) { + Text("No active sockets", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.6f)) + } else { + wifiAwareConnected.entries.take(50).forEach { (peer, ip) -> + Text("• ${peer.take(8)}… @ $ip", fontFamily = FontFamily.Monospace, fontSize = 12.sp) + } + } + } + } + } + // Connected devices item { Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { diff --git a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt new file mode 100644 index 00000000..d10c6741 --- /dev/null +++ b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt @@ -0,0 +1,116 @@ +package com.bitchat.android.wifiaware + +import android.content.Context +import android.os.Build +import android.util.Log +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch + +/** + * WifiAwareController manages lifecycle and debug surfacing for the WifiAwareMeshService. + * It starts/stops the service based on debug preferences and exposes simple flows for UI. + */ +object WifiAwareController { + private const val TAG = "WifiAwareController" + + private var service: WifiAwareMeshService? = null + private var appContext: Context? = null + + private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + + private val _enabled = MutableStateFlow(false) + val enabled: StateFlow = _enabled.asStateFlow() + + private val _running = MutableStateFlow(false) + val running: StateFlow = _running.asStateFlow() + + // Simple debug surfacing + private val _connectedPeers = MutableStateFlow>(emptyMap()) // peerID -> ip + val connectedPeers: StateFlow> = _connectedPeers.asStateFlow() + + private val _knownPeers = MutableStateFlow>(emptyMap()) // peerID -> nickname + val knownPeers: StateFlow> = _knownPeers.asStateFlow() + + private val _discoveredPeers = MutableStateFlow>(emptySet()) + val discoveredPeers: StateFlow> = _discoveredPeers.asStateFlow() + + fun initialize(context: Context, enabledByDefault: Boolean) { + appContext = context.applicationContext + setEnabled(enabledByDefault) + // Start background poller for debug surfacing + scope.launch { + while (isActive) { + try { + val s = service + if (s != null) { + _connectedPeers.value = s.getDeviceAddressToPeerMapping() // peerID -> ip + _knownPeers.value = s.getPeerNicknames() + _discoveredPeers.value = s.getDiscoveredPeerIds() + } else { + _connectedPeers.value = emptyMap() + _knownPeers.value = emptyMap() + _discoveredPeers.value = emptySet() + } + } catch (_: Exception) { } + delay(1000) + } + } + } + + fun setEnabled(value: Boolean) { + _enabled.value = value + if (value) startIfPossible() else stop() + } + + fun startIfPossible() { + if (_running.value) return + val ctx = appContext ?: return + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + Log.w(TAG, "Wi‑Fi Aware requires Android 10 (Q)+; disabled.") + try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware not supported on this device (requires Android 10+)")) } catch (_: Exception) {} + return + } + // Android 13+: require NEARBY_WIFI_DEVICES runtime permission + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + val granted = androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.NEARBY_WIFI_DEVICES) == android.content.pm.PackageManager.PERMISSION_GRANTED + if (!granted) { + Log.w(TAG, "Missing NEARBY_WIFI_DEVICES permission; not starting Wi‑Fi Aware") + try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Grant Nearby Wi‑Fi Devices to start Wi‑Fi Aware")) } catch (_: Exception) {} + return + } + } + try { + service = WifiAwareMeshService(ctx).also { + it.startServices() + _running.value = true + try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware started")) } catch (_: Exception) {} + } + } catch (e: Throwable) { + Log.e(TAG, "Failed to start WifiAwareMeshService", e) + _running.value = false + try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware failed to start: ${e.message}")) } catch (_: Exception) {} + } + } + + fun stop() { + try { service?.stopServices() } catch (_: Exception) { } + service = null + _running.value = false + try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware stopped")) } catch (_: Exception) {} + } + + fun getService(): WifiAwareMeshService? = service + + // Optional bridge to BLE mesh for cross-transport relaying + @Volatile private var bleMesh: com.bitchat.android.mesh.BluetoothMeshService? = null + fun setBleMeshService(svc: com.bitchat.android.mesh.BluetoothMeshService) { bleMesh = svc } + fun getBleMeshService(): com.bitchat.android.mesh.BluetoothMeshService? = bleMesh +} diff --git a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt new file mode 100644 index 00000000..f895a7cb --- /dev/null +++ b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt @@ -0,0 +1,1277 @@ +package com.bitchat.android.wifiaware + +import android.Manifest +import android.annotation.SuppressLint +import android.content.Context +import android.net.* +import android.net.wifi.aware.* +import android.os.Build +import android.os.Handler +import android.os.Looper +import android.util.Log +import androidx.annotation.RequiresApi +import androidx.annotation.RequiresPermission +import com.bitchat.android.crypto.EncryptionService +import com.bitchat.android.model.* +import com.bitchat.android.protocol.* +import com.bitchat.android.sync.GossipSyncManager +import com.bitchat.android.util.toHexString +// Mesh-layer components are reused from the existing Bluetooth stack +import com.bitchat.android.mesh.PeerManager +import com.bitchat.android.mesh.PeerManagerDelegate +import com.bitchat.android.mesh.PeerInfo +import com.bitchat.android.mesh.FragmentManager +import com.bitchat.android.mesh.SecurityManager +import com.bitchat.android.mesh.SecurityManagerDelegate +import com.bitchat.android.mesh.StoreForwardManager +import com.bitchat.android.mesh.StoreForwardManagerDelegate +import com.bitchat.android.mesh.MessageHandler +import com.bitchat.android.mesh.MessageHandlerDelegate +import com.bitchat.android.mesh.PacketProcessor +import com.bitchat.android.mesh.PacketProcessorDelegate +import kotlinx.coroutines.* +import java.io.IOException +import java.net.Inet6Address +import java.net.ServerSocket +import java.net.Socket +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.util.UUID +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.Executors + +/** + * WifiAware mesh service - LATEST + * + * This is now a coordinator that orchestrates the following components: + * - PeerManager: Peer lifecycle management + * - FragmentManager: Message fragmentation and reassembly + * - SecurityManager: Security, duplicate detection, encryption + * - StoreForwardManager: Offline message caching + * - MessageHandler: Message type processing and relay logic + * - PacketProcessor: Incoming packet routing + */ +class WifiAwareMeshService(private val context: Context) { + + companion object { + private const val TAG = "WifiAwareMeshService" + private const val MAX_TTL: UByte = 7u + private const val SERVICE_NAME = "bitchat" + private const val PSK = "bitchat_secret" + } + + // Core crypto/services + private val encryptionService = EncryptionService(context) + + // Peer ID must match BluetoothMeshService: first 16 hex chars of identity fingerprint (8 bytes) + val myPeerID: String = encryptionService.getIdentityFingerprint().take(16) + + // Core components + private val peerManager = PeerManager() + private val fragmentManager = FragmentManager() + private val securityManager = SecurityManager(encryptionService, myPeerID) + private val storeForwardManager = StoreForwardManager() + private val messageHandler = MessageHandler(myPeerID, context.applicationContext) + private val packetProcessor = PacketProcessor(myPeerID) + + // Gossip sync + private val gossipSyncManager: GossipSyncManager + + // Wi-Fi Aware transport + private val awareManager = context.getSystemService(WifiAwareManager::class.java) + private var wifiAwareSession: WifiAwareSession? = null + private var publishSession: PublishDiscoverySession? = null + private var subscribeSession: SubscribeDiscoverySession? = null + private val listenerExec = Executors.newCachedThreadPool() + private var isActive = false + + // Delegate + var delegate: WifiAwareMeshDelegate? = null + + // Transport state + private val peerSockets = ConcurrentHashMap() + private val serverSockets = ConcurrentHashMap() + private val networkCallbacks = ConcurrentHashMap() + private val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + private val handleToPeerId = ConcurrentHashMap() // discovery mapping + private val discoveredTimestamps = ConcurrentHashMap() // peerID -> last seen time + + // Timestamp dedupe + private val lastTimestamps = ConcurrentHashMap() + + // Coroutines + private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob()) + + init { + setupDelegates() + messageHandler.packetProcessor = packetProcessor + + // Use shared GossipSyncManager from MeshServiceHolder if available (minimal refactor) + val shared = com.bitchat.android.service.MeshServiceHolder.sharedGossipSyncManager + if (shared != null) { + gossipSyncManager = shared + } else { + gossipSyncManager = GossipSyncManager( + myPeerID = myPeerID, + scope = serviceScope, + configProvider = object : GossipSyncManager.ConfigProvider { + override fun seenCapacity(): Int = 500 + override fun gcsMaxBytes(): Int = 400 + override fun gcsTargetFpr(): Double = 0.01 + } + ) + gossipSyncManager.delegate = object : GossipSyncManager.Delegate { + override fun sendPacketToPeer(peerID: String, packet: BitchatPacket) { + this@WifiAwareMeshService.sendPacketToPeer(peerID, packet) + } + override fun sendPacket(packet: BitchatPacket) { + broadcastPacket(RoutedPacket(packet)) + } + override fun signPacketForBroadcast(packet: BitchatPacket): BitchatPacket { + return signPacketBeforeBroadcast(packet) + } + } + } + } + + /** + * Helper method hexToBa. + */ + private fun hexStringToByteArray(hex: String): ByteArray { + val out = ByteArray(8) + var idx = 0 + var s = hex + while (s.length >= 2 && idx < 8) { + val b = s.substring(0, 2).toIntOrNull(16)?.toByte() ?: 0 + out[idx++] = b + s = s.drop(2) + } + return out + } + + /** + * Sign packet before broadcasting. + */ + private fun signPacketBeforeBroadcast(packet: BitchatPacket): BitchatPacket { + val data = packet.toBinaryDataForSigning() ?: return packet + val sig = encryptionService.signData(data) ?: return packet + return packet.copy(signature = sig) + } + + /** + * Broadcasts raw bytes to currently connected peer. + */ + private fun broadcastRaw(bytes: ByteArray) { + var sent = 0 + peerSockets.forEach { (pid, sock) -> + try { + sock.getOutputStream().write(bytes) + sent++ + } catch (e: IOException) { + Log.e(TAG, "TX: write failed to ${pid.take(8)}: ${e.message}") + } + } + Log.i(TAG, "TX: broadcast via Wi-Fi Aware to $sent peers (bytes=${bytes.size})") + } + + /** + * Broadcasts routed packet to currently connected peers. + */ + private fun broadcastPacket(routed: RoutedPacket) { + Log.d(TAG, "TX: packet type=${routed.packet.type} broadcast (ttl=${routed.packet.ttl})") + // Wi-Fi Aware uses full packets; no fragmentation + val data = routed.packet.toBinaryData() ?: return + serviceScope.launch { broadcastRaw(data) } + } + + // Expose a public method so BLE can forward relays to Wi-Fi Aware + fun broadcastRoutedPacket(routed: RoutedPacket) { + broadcastPacket(routed) + } + + /** + * Send packet to connected peer. + */ + private fun sendPacketToPeer(peerID: String, packet: BitchatPacket) { + // Wi-Fi Aware uses full packets; no fragmentation + val data = packet.toBinaryData() ?: return + serviceScope.launch { + val sock = peerSockets[peerID] + if (sock == null) { + Log.w(TAG, "TX: no socket for ${peerID.take(8)}") + return@launch + } + try { + sock.getOutputStream().write(data) + Log.d(TAG, "TX: packet type=${packet.type} to ${peerID.take(8)} (bytes=${data.size})") + } catch (e: IOException) { + Log.e(TAG, "TX: write to ${peerID.take(8)} failed: ${e.message}") + } + } + } + + /** + * Configures delegates for internal components so that events are routed back + * through this service and ultimately to the {@link WifiAwareMeshDelegate}. + */ + private fun setupDelegates() { + peerManager.delegate = object : PeerManagerDelegate { + override fun onPeerListUpdated(peerIDs: List) { + delegate?.didUpdatePeerList(peerIDs) + } + override fun onPeerRemoved(peerID: String) { + try { gossipSyncManager.removeAnnouncementForPeer(peerID) } catch (_: Exception) { } + try { encryptionService.removePeer(peerID) } catch (_: Exception) { } + } + } + + securityManager.delegate = object : SecurityManagerDelegate { + override fun onKeyExchangeCompleted(peerID: String, peerPublicKeyData: ByteArray) { + serviceScope.launch { + delay(100) + sendAnnouncementToPeer(peerID) + delay(1000) + storeForwardManager.sendCachedMessages(peerID) + } + } + override fun sendHandshakeResponse(peerID: String, response: ByteArray) { + val packet = BitchatPacket( + version = 1u, + type = MessageType.NOISE_HANDSHAKE.value, + senderID = hexStringToByteArray(myPeerID), + recipientID = hexStringToByteArray(peerID), + timestamp = System.currentTimeMillis().toULong(), + payload = response, + ttl = MAX_TTL + ) + broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) + } + override fun getPeerInfo(peerID: String): PeerInfo? { + return peerManager.getPeerInfo(peerID) + } + } + + storeForwardManager.delegate = object : StoreForwardManagerDelegate { + override fun isFavorite(peerID: String) = delegate?.isFavorite(peerID) ?: false + override fun isPeerOnline(peerID: String) = peerManager.isPeerActive(peerID) + override fun sendPacket(packet: BitchatPacket) { + broadcastPacket(RoutedPacket(packet)) + } + } + + messageHandler.delegate = object : MessageHandlerDelegate { + override fun addOrUpdatePeer(peerID: String, nickname: String) = + peerManager.addOrUpdatePeer(peerID, nickname) + override fun removePeer(peerID: String) = peerManager.removePeer(peerID) + override fun updatePeerNickname(peerID: String, nickname: String) { + peerManager.addOrUpdatePeer(peerID, nickname) + } + override fun getPeerNickname(peerID: String) = + peerManager.getPeerNickname(peerID) + override fun getNetworkSize() = peerManager.getActivePeerCount() + override fun getMyNickname() = delegate?.getNickname() + override fun getPeerInfo(peerID: String): PeerInfo? = peerManager.getPeerInfo(peerID) + override fun updatePeerInfo( + peerID: String, + nickname: String, + noisePublicKey: ByteArray, + signingPublicKey: ByteArray, + isVerified: Boolean + ): Boolean = peerManager.updatePeerInfo(peerID, nickname, noisePublicKey, signingPublicKey, isVerified) + + override fun sendPacket(packet: BitchatPacket) { + broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) + } + override fun relayPacket(routed: RoutedPacket) { broadcastPacket(routed) } + override fun getBroadcastRecipient() = SpecialRecipients.BROADCAST + + override fun verifySignature(packet: BitchatPacket, peerID: String) = + securityManager.verifySignature(packet, peerID) + override fun encryptForPeer(data: ByteArray, recipientPeerID: String) = + securityManager.encryptForPeer(data, recipientPeerID) + override fun decryptFromPeer(encryptedData: ByteArray, senderPeerID: String) = + securityManager.decryptFromPeer(encryptedData, senderPeerID) + override fun verifyEd25519Signature(signature: ByteArray, data: ByteArray, publicKey: ByteArray): Boolean = + encryptionService.verifyEd25519Signature(signature, data, publicKey) + + override fun hasNoiseSession(peerID: String) = + encryptionService.hasEstablishedSession(peerID) + override fun initiateNoiseHandshake(peerID: String) { + serviceScope.launch { + val hs = encryptionService.initiateHandshake(peerID) ?: return@launch + val packet = BitchatPacket( + version = 1u, + type = MessageType.NOISE_HANDSHAKE.value, + senderID = hexStringToByteArray(myPeerID), + recipientID = hexStringToByteArray(peerID), + timestamp = System.currentTimeMillis().toULong(), + payload = hs, + ttl = MAX_TTL + ) + broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) + } + } + override fun processNoiseHandshakeMessage(payload: ByteArray, peerID: String): ByteArray? = + try { encryptionService.processHandshakeMessage(payload, peerID) } catch (_: Exception) { null } + + override fun updatePeerIDBinding(newPeerID: String, nickname: String, publicKey: ByteArray, previousPeerID: String?) { + peerManager.addOrUpdatePeer(newPeerID, nickname) + val fingerprint = peerManager.storeFingerprintForPeer(newPeerID, publicKey) + previousPeerID?.let { peerManager.removePeer(it) } + Log.d(TAG, "Updated peer binding to $newPeerID, fp=${fingerprint.take(16)}") + } + + override fun decryptChannelMessage(encryptedContent: ByteArray, channel: String) = + delegate?.decryptChannelMessage(encryptedContent, channel) + + override fun onMessageReceived(message: BitchatMessage) { + delegate?.didReceiveMessage(message) + } + override fun onChannelLeave(channel: String, fromPeer: String) { + delegate?.didReceiveChannelLeave(channel, fromPeer) + } + override fun onDeliveryAckReceived(messageID: String, peerID: String) { + delegate?.didReceiveDeliveryAck(messageID, peerID) + } + override fun onReadReceiptReceived(messageID: String, peerID: String) { + delegate?.didReceiveReadReceipt(messageID, peerID) + } + } + + packetProcessor.delegate = object : PacketProcessorDelegate { + override fun validatePacketSecurity(packet: BitchatPacket, peerID: String) = + securityManager.validatePacket(packet, peerID) + override fun updatePeerLastSeen(peerID: String) = peerManager.updatePeerLastSeen(peerID) + override fun getPeerNickname(peerID: String): String? = peerManager.getPeerNickname(peerID) + override fun getNetworkSize(): Int = peerManager.getActivePeerCount() + override fun getBroadcastRecipient(): ByteArray = SpecialRecipients.BROADCAST + + override fun handleNoiseHandshake(routed: RoutedPacket): Boolean = + runBlocking { securityManager.handleNoiseHandshake(routed) } + + override fun handleNoiseEncrypted(routed: RoutedPacket) { + serviceScope.launch { messageHandler.handleNoiseEncrypted(routed) } + } + + override fun handleAnnounce(routed: RoutedPacket) { + serviceScope.launch { + val isFirst = messageHandler.handleAnnounce(routed) + routed.peerID?.let { pid -> + try { gossipSyncManager.scheduleInitialSyncToPeer(pid, 1_000) } catch (_: Exception) { } + } + try { gossipSyncManager.onPublicPacketSeen(routed.packet) } catch (_: Exception) { } + } + } + + override fun handleMessage(routed: RoutedPacket) { + serviceScope.launch { messageHandler.handleMessage(routed) } + try { + val pkt = routed.packet + val isBroadcast = (pkt.recipientID == null || pkt.recipientID.contentEquals(SpecialRecipients.BROADCAST)) + if (isBroadcast && pkt.type == MessageType.MESSAGE.value) { + gossipSyncManager.onPublicPacketSeen(pkt) + } + } catch (_: Exception) { } + } + + override fun handleLeave(routed: RoutedPacket) { + serviceScope.launch { messageHandler.handleLeave(routed) } + } + + override fun handleFragment(packet: BitchatPacket): BitchatPacket? { + try { + val isBroadcast = (packet.recipientID == null || packet.recipientID.contentEquals(SpecialRecipients.BROADCAST)) + if (isBroadcast && packet.type == MessageType.FRAGMENT.value) { + gossipSyncManager.onPublicPacketSeen(packet) + } + } catch (_: Exception) { } + return fragmentManager.handleFragment(packet) + } + + override fun sendAnnouncementToPeer(peerID: String) = this@WifiAwareMeshService.sendAnnouncementToPeer(peerID) + override fun sendCachedMessages(peerID: String) = storeForwardManager.sendCachedMessages(peerID) + override fun relayPacket(routed: RoutedPacket) = broadcastPacket(routed) + + override fun handleRequestSync(routed: RoutedPacket) { + val fromPeer = routed.peerID ?: return + val req = RequestSyncPacket.decode(routed.packet.payload) ?: return + gossipSyncManager.handleRequestSync(fromPeer, req) + } + } + } + + /** + * Starts Wi-Fi Aware services (publish + subscribe). + * + * Requires Wi-Fi state and location permissions. This method attaches to the + * Aware session and initializes both the publisher (server role) and subscriber + * (client role). + */ + @SuppressLint("MissingPermission") + @RequiresPermission(allOf = [ + Manifest.permission.ACCESS_WIFI_STATE, + Manifest.permission.CHANGE_WIFI_STATE + ]) + fun startServices() { + if (isActive) return + isActive = true + Log.i(TAG, "Starting Wi-Fi Aware mesh with peer ID: $myPeerID") + + awareManager?.attach(object : AttachCallback() { + @SuppressLint("MissingPermission") + @RequiresPermission(allOf = [ + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.NEARBY_WIFI_DEVICES + ]) + override fun onAttached(session: WifiAwareSession) { + wifiAwareSession = session + Log.i(TAG, "Wi-Fi Aware attached; starting publish & subscribe (peerID=$myPeerID)") + + // PUBLISH (server role) + session.publish( + PublishConfig.Builder() + .setServiceName(SERVICE_NAME) + .setServiceSpecificInfo(myPeerID.toByteArray()) + .build(), + object : DiscoverySessionCallback() { + override fun onPublishStarted(pub: PublishDiscoverySession) { + publishSession = pub + Log.d(TAG, "PUBLISH: onPublishStarted()") + } + override fun onServiceDiscovered( + peerHandle: PeerHandle, + serviceSpecificInfo: ByteArray, + matchFilter: List + ) { + val peerId = try { String(serviceSpecificInfo) } catch (_: Exception) { "" } + handleToPeerId[peerHandle] = peerId + if (peerId.isNotBlank()) discoveredTimestamps[peerId] = System.currentTimeMillis() + Log.d(TAG, "PUBLISH: onServiceDiscovered ssi='${peerId.take(16)}' len=${serviceSpecificInfo.size}") + } + + @RequiresApi(Build.VERSION_CODES.Q) + override fun onMessageReceived( + peerHandle: PeerHandle, + message: ByteArray + ) { + if (message.isEmpty()) return + val subscriberId = try { String(message) } catch (_: Exception) { "" } + if (subscriberId == myPeerID) return + + handleToPeerId[peerHandle] = subscriberId + if (subscriberId.isNotBlank()) discoveredTimestamps[subscriberId] = System.currentTimeMillis() + Log.d(TAG, "PUBLISH: got ping from $subscriberId; spinning up server") + handleSubscriberPing(publishSession!!, peerHandle) + } + }, + Handler(Looper.getMainLooper()) + ) + + // SUBSCRIBE (client role) + session.subscribe( + SubscribeConfig.Builder() + .setServiceName(SERVICE_NAME) + .build(), + object : DiscoverySessionCallback() { + override fun onSubscribeStarted(sub: SubscribeDiscoverySession) { + subscribeSession = sub + Log.d(TAG, "SUBSCRIBE: onSubscribeStarted()") + } + override fun onServiceDiscovered( + peerHandle: PeerHandle, + serviceSpecificInfo: ByteArray, + matchFilter: List + ) { + val peerId = try { String(serviceSpecificInfo) } catch (_: Exception) { "" } + handleToPeerId[peerHandle] = peerId + val msgId = (System.nanoTime() and 0x7fffffff).toInt() + subscribeSession?.sendMessage(peerHandle, msgId, myPeerID.toByteArray()) + if (peerId.isNotBlank()) discoveredTimestamps[peerId] = System.currentTimeMillis() + Log.d(TAG, "SUBSCRIBE: sent ping to '${peerId.take(16)}' (msgId=$msgId)") + } + + @RequiresApi(Build.VERSION_CODES.Q) + override fun onMessageReceived( + peerHandle: PeerHandle, + message: ByteArray + ) { + if (message.isEmpty()) return + val peerId = handleToPeerId[peerHandle] ?: return + if (peerId == myPeerID) return + + Log.d(TAG, "SUBSCRIBE: onMessageReceived() → server-ready from ${peerId.take(8)} payload=${message.size}B") + handleServerReady(peerHandle, message) + } + }, + Handler(Looper.getMainLooper()) + ) + } + override fun onAttachFailed() { + Log.e(TAG, "Wi-Fi Aware attach failed") + } + }, Handler(Looper.getMainLooper())) + + sendPeriodicBroadcastAnnounce() + gossipSyncManager.start() + } + + /** + * Stops the Wi-Fi Aware mesh services and cleans up sockets and sessions. + */ + fun stopServices() { + if (!isActive) return + isActive = false + Log.i(TAG, "Stopping Wi-Fi Aware mesh") + + sendLeaveAnnouncement() + + serviceScope.launch { + delay(200) + + gossipSyncManager.stop() + + networkCallbacks.values.forEach { runCatching { cm.unregisterNetworkCallback(it) } } + networkCallbacks.clear() + publishSession?.close(); publishSession = null + subscribeSession?.close(); subscribeSession = null + wifiAwareSession?.close(); wifiAwareSession = null + + serverSockets.values.forEach { it.closeQuietly() } + peerSockets.values.forEach { it.closeQuietly() } + handleToPeerId.clear() + serverSockets.clear() + peerSockets.clear() + + peerManager.shutdown() + fragmentManager.shutdown() + securityManager.shutdown() + storeForwardManager.shutdown() + messageHandler.shutdown() + packetProcessor.shutdown() + + serviceScope.cancel() + } + } + + /** + * Periodically broadcasts an ANNOUNCE packet (every ~30s) while the service is active, + * so new/idle peers can discover us without user action. + */ + private fun sendPeriodicBroadcastAnnounce() { + serviceScope.launch { + while (isActive) { + try { delay(30_000); sendBroadcastAnnounce() } catch (_: Exception) { } + } + } + } + + /** + * Handles subscriber ping: spawns a server socket and responds with connection info. + * + * @param pubSession The current publish discovery session + * @param peerHandle The handle for the peer that pinged us + */ + @RequiresApi(Build.VERSION_CODES.Q) + private fun handleSubscriberPing( + pubSession: PublishDiscoverySession, + peerHandle: PeerHandle + ) { + val peerId = handleToPeerId[peerHandle] ?: return + if (!amIServerFor(peerId)) return + + if (serverSockets.containsKey(peerId)) { + Log.v(TAG, "↪ already serving $peerId, skipping") + return + } + + val ss = ServerSocket(0) + serverSockets[peerId] = ss + val port = ss.localPort + + // Ensure port is set to reuse if connection was recently closed (TIME_WAIT) + try { + ss.reuseAddress = true + } catch (_: Exception) {} + + Log.d(TAG, "SERVER: listening for ${peerId.take(8)} on port $port") + + val spec = WifiAwareNetworkSpecifier.Builder(pubSession, peerHandle) + .setPskPassphrase(PSK) + .setPort(port) + .build() + // Default capabilities include NET_CAPABILITY_NOT_VPN. + // Keeping defaults for hardware interface handle acquisition compatibility with global VPNs. + val req = NetworkRequest.Builder() + .addTransportType(NetworkCapabilities.TRANSPORT_WIFI_AWARE) + .setNetworkSpecifier(spec) + .build() + + val cb = object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { + try { + val client = ss.accept() + try { network.bindSocket(client) } catch (e: Exception) { Log.w(TAG, "Server bindSocket EPERM: ${e.message}") } + client.keepAlive = true + Log.d(TAG, "SERVER: accepted TCP from ${peerId.take(8)} addr=${client.inetAddress?.hostAddress}") + peerSockets[peerId] = client + try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {} + try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {} + listenerExec.execute { listenToPeer(client, peerId) } + handleSubscriberKeepAlive(client, peerId, pubSession, peerHandle) + // Kick off Noise handshake for this logical peer + if (myPeerID < peerId) { + messageHandler.delegate?.initiateNoiseHandshake(peerId) + Log.d(TAG, "SERVER: initiating Noise handshake to ${peerId.take(8)} (lower ID)") + } + // Ensure fast presence even before handshake settles + serviceScope.launch { delay(150); sendBroadcastAnnounce() } + } catch (ioe: IOException) { + Log.e(TAG, "SERVER: accept failed for ${peerId.take(8)}", ioe) + } + } + override fun onLost(network: Network) { + networkCallbacks.remove(peerId) + Log.d(TAG, "SERVER: network lost for ${peerId.take(8)}") + } + } + + networkCallbacks[peerId] = cb + Log.d(TAG, "SERVER: requesting Aware network for ${peerId.take(8)}") + cm.requestNetwork(req, cb) + + val readyId = (System.nanoTime() and 0x7fffffff).toInt() + val portBytes = ByteBuffer.allocate(4) + .order(ByteOrder.BIG_ENDIAN) + .putInt(port) + .array() + Handler(Looper.getMainLooper()).post { + try { + val sent = pubSession.sendMessage(peerHandle, readyId, portBytes) + Log.d(TAG, "PUBLISH: server-ready sent=$sent (msgId=$readyId, port=$port)") + } catch (e: Exception) { + Log.e(TAG, "PUBLISH: Exception sending server-ready to $peerHandle", e) + } + } + } + + /** + * Sends periodic TCP and discovery keep-alive messages to maintain a subscriber connection. + * + * @param client Connected client socket + * @param peerId ID of the connected peer + */ + private fun handleSubscriberKeepAlive( + client: Socket, + peerId: String, + pubSession: PublishDiscoverySession, + peerHandle: PeerHandle + ) { + // TCP keep-alive pings + serviceScope.launch { + try { + val os = client.getOutputStream() + while (peerSockets.containsKey(peerId)) { + try { os.write(0) } catch (_: IOException) { break } + delay(2_000) + } + } catch (_: Exception) {} + } + // Discovery keep-alive + serviceScope.launch { + var msgId = 0 + while (peerSockets.containsKey(peerId)) { + try { pubSession.sendMessage(peerHandle, msgId++, ByteArray(0)) } catch (_: Exception) { break } + delay(20_000) + } + } + } + + /** + * Handles a "server ready" message from a publishing peer and initiates a client connection. + */ + @RequiresApi(Build.VERSION_CODES.Q) + private fun handleServerReady( + peerHandle: PeerHandle, + payload: ByteArray + ) { + if (payload.size < Int.SIZE_BYTES) { + Log.w(TAG, "handleServerReady called with invalid payload size=${payload.size}, dropping") + return + } + + val peerId = handleToPeerId[peerHandle] ?: return + if (amIServerFor(peerId)) return + if (peerSockets.containsKey(peerId)) { + Log.v(TAG, "↪ already client-connected to $peerId, skipping") + return + } + + val port = ByteBuffer.wrap(payload).order(ByteOrder.BIG_ENDIAN).int + Log.d(TAG, "CLIENT: connecting to ${peerId.take(8)} port=$port") + + val spec = WifiAwareNetworkSpecifier.Builder(subscribeSession!!, peerHandle) + .setPskPassphrase(PSK) + .build() + val req = NetworkRequest.Builder() + .addTransportType(NetworkCapabilities.TRANSPORT_WIFI_AWARE) + .setNetworkSpecifier(spec) + .build() + + val cb = object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { + // Do not bind process for Aware; use per-socket binding instead + } + override fun onCapabilitiesChanged(network: Network, nc: NetworkCapabilities) { + if (peerSockets.containsKey(peerId)) return + val info = (nc.transportInfo as? WifiAwareNetworkInfo) ?: return + val addr = info.peerIpv6Addr as? Inet6Address ?: return + + val lp = cm.getLinkProperties(network) + val iface = lp?.interfaceName + + try { + val sock = Socket() + try { network.bindSocket(sock) } catch (e: Exception) { Log.w(TAG, "Client bindSocket EPERM: ${e.message}") } + sock.tcpNoDelay = true + sock.keepAlive = true + + // Use scoped IPv6 if interface name is available + val scopedAddr = if (iface != null && addr.scopeId == 0) { + try { + Inet6Address.getByAddress(null, addr.address, java.net.NetworkInterface.getByName(iface)) + } catch (e: Exception) { + addr + } + } else { + addr + } + + sock.connect(java.net.InetSocketAddress(scopedAddr, port), 7000) + Log.d(TAG, "CLIENT: TCP connected to ${peerId.take(8)} addr=$scopedAddr:$port (iface=$iface)") + + peerSockets[peerId] = sock + try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {} + try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {} + listenerExec.execute { listenToPeer(sock, peerId) } + handleServerKeepAlive(sock, peerId, peerHandle) + // Kick off Noise handshake for this logical peer + if (myPeerID < peerId) { + messageHandler.delegate?.initiateNoiseHandshake(peerId) + Log.d(TAG, "CLIENT: initiating Noise handshake to ${peerId.take(8)} (lower ID)") + } + // Ensure fast presence even before handshake settles + serviceScope.launch { delay(150); sendBroadcastAnnounce() } + } catch (ioe: IOException) { + Log.e(TAG, "CLIENT: socket connect failed to ${peerId.take(8)}", ioe) + } + } + override fun onLost(network: Network) { + networkCallbacks.remove(peerId) + Log.d(TAG, "CLIENT: network lost for ${peerId.take(8)}") + } + } + + networkCallbacks[peerId] = cb + Log.d(TAG, "CLIENT: requesting Aware network for ${peerId.take(8)}") + cm.requestNetwork(req, cb) + } + + /** + * Sends periodic TCP and discovery keep-alive messages for server connections. + */ + private fun handleServerKeepAlive( + sock: Socket, + peerId: String, + peerHandle: PeerHandle + ) { + // TCP keep-alive + serviceScope.launch { + try { + val os = sock.getOutputStream() + while (peerSockets.containsKey(peerId)) { + try { os.write(0) } catch (_: IOException) { break } + delay(2_000) + } + } catch (_: Exception) {} + } + // Discovery keep-alive + serviceScope.launch { + var msgId = 0 + while (peerSockets.containsKey(peerId)) { + try { subscribeSession?.sendMessage(peerHandle, msgId++, ByteArray(0)) } catch (_: Exception) { break } + delay(20_000) + } + } + } + + /** + * Determines whether this device should act as the server in a given peer relationship. + */ + private fun amIServerFor(peerId: String) = myPeerID < peerId + + /** + * Listens for incoming packets from a connected peer and dispatches them through + * the packet processor. + * + * @param socket Socket connected to the peer + * @param initialLogicalPeerId Temporary identifier before peer ID resolution + */ + private fun listenToPeer(socket: Socket, initialLogicalPeerId: String) { + val inStream = socket.getInputStream() + val buf = ByteArray(64 * 1024) + var routedPeerId: String? = null + + while (isActive) { + val len = try { inStream.read(buf) } catch (_: IOException) { break } + if (len <= 0) break + + val raw = buf.copyOf(len) + val pkt = BitchatPacket.fromBinaryData(raw) ?: continue + + val senderPeerHex = pkt.senderID?.toHexString()?.take(16) ?: continue + if (senderPeerHex == myPeerID) continue + + val ts = pkt.timestamp + if (lastTimestamps.put(senderPeerHex, ts) == ts) { + continue + } + + if (routedPeerId == null) { + routedPeerId = senderPeerHex + peerSockets[routedPeerId] = socket + } + + Log.d(TAG, "RX: packet type=${pkt.type} from ${senderPeerHex.take(8)} (bytes=${raw.size})") + packetProcessor.processPacket(RoutedPacket(pkt, routedPeerId)) + } + + // Breaking out of the loop means the socket is dead or service is stopping. + // We MUST notify the mesh layer so it removes the logical peer immediately to allow reconnection. + Log.i(TAG, "Socket loop terminated for ${initialLogicalPeerId.take(8)} removing peer.") + handlePeerDisconnection(initialLogicalPeerId, routedPeerId) + socket.closeQuietly() + } + + private fun handlePeerDisconnection(initialId: String, routedId: String?) { + serviceScope.launch { + Log.d(TAG, "Cleaning up peer: $initialId / $routedId") + + peerSockets.remove(initialId)?.closeQuietly() + serverSockets.remove(initialId)?.closeQuietly() + networkCallbacks.remove(initialId)?.let { runCatching { cm.unregisterNetworkCallback(it) } } + peerManager.removePeer(initialId) + + routedId?.let { id -> + if (id != initialId) { + peerSockets.remove(id)?.closeQuietly() + serverSockets.remove(id)?.closeQuietly() + networkCallbacks.remove(id)?.let { runCatching { cm.unregisterNetworkCallback(it) } } + peerManager.removePeer(id) + } + } + } + } + + /** + * Sends a broadcast message to all peers. + * @param content Text content of the message + * @param mentions Optional list of mentioned peer IDs + * @param channel Optional channel name + */ + fun sendMessage(content: String, mentions: List = emptyList(), channel: String? = null) { + if (content.isEmpty()) return + + serviceScope.launch { + val packet = BitchatPacket( + version = 1u, + type = MessageType.MESSAGE.value, + senderID = hexStringToByteArray(myPeerID), + recipientID = SpecialRecipients.BROADCAST, + timestamp = System.currentTimeMillis().toULong(), + payload = content.toByteArray(Charsets.UTF_8), + signature = null, + ttl = MAX_TTL + ) + val signed = signPacketBeforeBroadcast(packet) + broadcastPacket(RoutedPacket(signed)) + try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } + } + } + + /** + * Sends a private encrypted message to a specific peer. + * + * @param content The message text + * @param recipientPeerID Destination peer ID + * @param recipientNickname Recipient nickname + * @param messageID Optional message ID (UUID if null) + */ + fun sendPrivateMessage(content: String, recipientPeerID: String, recipientNickname: String, messageID: String? = null) { + if (content.isEmpty() || recipientPeerID.isEmpty()) return + + serviceScope.launch { + val finalId = messageID ?: UUID.randomUUID().toString() + + if (encryptionService.hasEstablishedSession(recipientPeerID)) { + try { + val pm = PrivateMessagePacket(messageID = finalId, content = content) + val tlv = pm.encode() ?: return@launch + val payload = NoisePayload(type = NoisePayloadType.PRIVATE_MESSAGE, data = tlv).encode() + val enc = encryptionService.encrypt(payload, recipientPeerID) + + val pkt = BitchatPacket( + version = 1u, + type = MessageType.NOISE_ENCRYPTED.value, + senderID = hexStringToByteArray(myPeerID), + recipientID = hexStringToByteArray(recipientPeerID), + timestamp = System.currentTimeMillis().toULong(), + payload = enc, + signature = null, + ttl = MAX_TTL + ) + broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(pkt))) + } catch (e: Exception) { + Log.e(TAG, "Failed to encrypt private message: ${e.message}") + } + } else { + messageHandler.delegate?.initiateNoiseHandshake(recipientPeerID) + } + } + } + + /** + * Sends a read receipt for a specific message to the given peer over an established + * Noise session. If no session exists, this will log an error. + * + * @param messageID The ID of the message that was read. + * @param recipientPeerID The peer to notify. + * @param readerNickname Nickname of the reader (may be shown by the receiver). + */ + fun sendReadReceipt(messageID: String, recipientPeerID: String, readerNickname: String) { + serviceScope.launch { + try { + val payload = NoisePayload( + type = NoisePayloadType.READ_RECEIPT, + data = messageID.toByteArray(Charsets.UTF_8) + ).encode() + val enc = encryptionService.encrypt(payload, recipientPeerID) + val pkt = BitchatPacket( + version = 1u, + type = MessageType.NOISE_ENCRYPTED.value, + senderID = hexStringToByteArray(myPeerID), + recipientID = hexStringToByteArray(recipientPeerID), + timestamp = System.currentTimeMillis().toULong(), + payload = enc, + signature = null, + ttl = MAX_TTL + ) + broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(pkt))) + } catch (e: Exception) { + Log.e(TAG, "Failed to send read receipt: ${e.message}") + } + } + } + + /** + * Broadcasts a file (TLV payload) to all peers. Uses protocol version 2 to support + * large payloads and generates a deterministic transferId (sha256 of payload) for UI/state. + * + * @param file Encoded metadata and chunks descriptor of the file to send. + */ + fun sendFileBroadcast(file: BitchatFilePacket) { + try { + val payload = file.encode() ?: run { Log.e(TAG, "file TLV encode failed"); return } + serviceScope.launch { + val pkt = BitchatPacket( + version = 2u, // FILE_TRANSFER big length + type = MessageType.FILE_TRANSFER.value, + senderID = hexStringToByteArray(myPeerID), + recipientID = SpecialRecipients.BROADCAST, + timestamp = System.currentTimeMillis().toULong(), + payload = payload, + signature = null, + ttl = MAX_TTL + ) + val signed = signPacketBeforeBroadcast(pkt) + val transferId = sha256Hex(payload) + broadcastPacket(RoutedPacket(signed, transferId = transferId)) + try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } + } + } catch (e: Exception) { + Log.e(TAG, "sendFileBroadcast failed: ${e.message}", e) + } + } + + /** + * Sends a file privately to a specific peer. If no Noise session is established, + * a handshake will be initiated and the send is deferred/aborted for now. + * + * @param recipientPeerID Target peer. + * @param file Encoded metadata and chunks descriptor of the file to send. + */ + fun sendFilePrivate(recipientPeerID: String, file: BitchatFilePacket) { + try { + serviceScope.launch { + if (!encryptionService.hasEstablishedSession(recipientPeerID)) { + messageHandler.delegate?.initiateNoiseHandshake(recipientPeerID) + return@launch + } + val tlv = file.encode() ?: return@launch + val np = NoisePayload(type = NoisePayloadType.FILE_TRANSFER, data = tlv).encode() + val enc = encryptionService.encrypt(np, recipientPeerID) + val pkt = BitchatPacket( + version = 1u, + type = MessageType.NOISE_ENCRYPTED.value, + senderID = hexStringToByteArray(myPeerID), + recipientID = hexStringToByteArray(recipientPeerID), + timestamp = System.currentTimeMillis().toULong(), + payload = enc, + signature = null, + ttl = MAX_TTL + ) + val signed = signPacketBeforeBroadcast(pkt) + val transferId = sha256Hex(tlv) + broadcastPacket(RoutedPacket(signed, transferId = transferId)) + } + } catch (e: Exception) { + Log.e(TAG, "sendFilePrivate failed: ${e.message}", e) + } + } + + /** + * Attempts to cancel an in-flight file transfer identified by its transferId. + * + * @param transferId Deterministic id (usually sha256 of the file TLV). + * @return true if a transfer with this id was found and cancellation was scheduled, false otherwise. + */ + fun cancelFileTransfer(transferId: String): Boolean { + return false + } + + /** + * Computes the SHA-256 of the given bytes and returns a lowercase hex string. + * Falls back to the byte-length in hex if MessageDigest is unavailable. + */ + private fun sha256Hex(bytes: ByteArray): String = try { + val md = java.security.MessageDigest.getInstance("SHA-256") + md.update(bytes); md.digest().joinToString("") { "%02x".format(it) } + } catch (_: Exception) { bytes.size.toString(16) } + + /** + * Broadcasts an ANNOUNCE packet to the entire mesh. + */ + fun sendBroadcastAnnounce() { + serviceScope.launch { + val nickname = delegate?.getNickname() ?: myPeerID + val staticKey = encryptionService.getStaticPublicKey() ?: run { + Log.e(TAG, "No static public key available for announcement"); return@launch + } + val signingKey = encryptionService.getSigningPublicKey() ?: run { + Log.e(TAG, "No signing public key available for announcement"); return@launch + } + + val tlvPayload = IdentityAnnouncement(nickname, staticKey, signingKey).encode() ?: return@launch + + val announcePacket = BitchatPacket( + type = MessageType.ANNOUNCE.value, + ttl = MAX_TTL, + senderID = myPeerID, + payload = tlvPayload + ) + val signed = signPacketBeforeBroadcast(announcePacket) + + broadcastPacket(RoutedPacket(signed)) + try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } + } + } + + /** + * Sends an ANNOUNCE packet to a specific peer. + */ + fun sendAnnouncementToPeer(peerID: String) { + if (peerManager.hasAnnouncedToPeer(peerID)) return + + val nickname = delegate?.getNickname() ?: myPeerID + val staticKey = encryptionService.getStaticPublicKey() ?: return + val signingKey = encryptionService.getSigningPublicKey() ?: return + + val tlvPayload = IdentityAnnouncement(nickname, staticKey, signingKey).encode() ?: return + + val packet = BitchatPacket( + type = MessageType.ANNOUNCE.value, + ttl = MAX_TTL, + senderID = myPeerID, + payload = tlvPayload + ) + val signed = signPacketBeforeBroadcast(packet) + + broadcastPacket(RoutedPacket(signed)) + peerManager.markPeerAsAnnouncedTo(peerID) + try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } + } + + /** + * Sends a LEAVE announcement to all peers before disconnecting. + */ + private fun sendLeaveAnnouncement() { + val nickname = delegate?.getNickname() ?: myPeerID + val packet = BitchatPacket( + type = MessageType.LEAVE.value, + ttl = MAX_TTL, + senderID = myPeerID, + payload = nickname.toByteArray() + ) + broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) + } + + /** @return Mapping of peer IDs to nicknames. */ + fun getPeerNicknames(): Map = peerManager.getAllPeerNicknames() + + /** @return Mapping of peer IDs to RSSI values. */ + fun getPeerRSSI(): Map = peerManager.getAllPeerRSSI() + + /** + * @return true if a Noise session with the peer is fully established. + */ + fun hasEstablishedSession(peerID: String) = encryptionService.hasEstablishedSession(peerID) + + /** + * @return a human-readable Noise session state for the given peer (implementation-defined). + */ + fun getSessionState(peerID: String) = encryptionService.getSessionState(peerID) + + /** + * Triggers a Noise handshake with the given peer. Safe to call repeatedly; no-op if already handshaking/established. + */ + fun initiateNoiseHandshake(peerID: String) = messageHandler.delegate?.initiateNoiseHandshake(peerID) + + /** + * @return the stored public-key fingerprint (hex) for a peer, if known. + */ + fun getPeerFingerprint(peerID: String): String? = peerManager.getFingerprintForPeer(peerID) + + /** + * Retrieves the full profile for a peer, including keys and verification state, if available. + */ + fun getPeerInfo(peerID: String): PeerInfo? = peerManager.getPeerInfo(peerID) + + /** + * Updates local metadata for a peer and returns whether the change was applied. + * + * @param peerID Target peer id. + * @param nickname Display name. + * @param noisePublicKey Peer’s Noise static public key. + * @param signingPublicKey Peer’s Ed25519 signing public key. + * @param isVerified Whether this identity is verified by the user. + * @return true if the record was updated or created, false otherwise. + */ + fun updatePeerInfo( + peerID: String, + nickname: String, + noisePublicKey: ByteArray, + signingPublicKey: ByteArray, + isVerified: Boolean + ): Boolean = peerManager.updatePeerInfo(peerID, nickname, noisePublicKey, signingPublicKey, isVerified) + + /** + * @return the local device’s long-term identity fingerprint (hex). + */ + fun getIdentityFingerprint(): String = encryptionService.getIdentityFingerprint() + + /** + * @return true if the UI should show an “encrypted” indicator for this peer. + */ + fun shouldShowEncryptionIcon(peerID: String) = encryptionService.hasEstablishedSession(peerID) + + /** + * @return a snapshot list of peers with established Noise sessions. + */ + fun getEncryptedPeers(): List = emptyList() + + /** + * @return the current IPv4/IPv6 address of a connected peer, if any. + * Prefers the scoped IPv6 address format. + */ + fun getDeviceAddressForPeer(peerID: String): String? = + peerSockets[peerID]?.let { resolveScopedAddress(it) } + + /** + * Helper to resolve a scoped IPv6 address from a socket for UI display. + */ + private fun resolveScopedAddress(sock: Socket): String? { + val addr = sock.inetAddress as? Inet6Address ?: return sock.inetAddress?.hostAddress + if (addr.scopeId != 0 || addr.isLoopbackAddress) return addr.hostAddress + + // If address has no scope but we are on Aware (Link-Local fe80), attempt interface resolution + val iface = try { + val lp = cm.getLinkProperties(cm.activeNetwork) + lp?.interfaceName ?: "aware0" + } catch (_: Exception) { "aware0" } + + return "${addr.hostAddress}%$iface" + } + + /** + * @return a mapping of peerID → connected device IP address for all active sockets. + * Results are formatted as scoped addresses if applicable. + */ + fun getDeviceAddressToPeerMapping(): Map { + val map = mutableMapOf() + peerSockets.forEach { (pid, sock) -> + map[pid] = resolveScopedAddress(sock) ?: "unknown" + } + return map + } + + /** + * @return map of peer ID to nickname, bridged for UI warning fix. + */ + fun getPeerNicknamesMap(): Map = peerManager.getAllPeerNicknames() + + /** Returns recently discovered peer IDs via Aware discovery (may not be connected). */ + fun getDiscoveredPeerIds(): Set = + (handleToPeerId.values + discoveredTimestamps.keys).filter { it.isNotBlank() }.toSet() + + /** + * Utility for logs/UI: pretty-prints one peer-to-address mapping per line. + */ + fun printDeviceAddressesForPeers(): String = + getDeviceAddressToPeerMapping().entries.joinToString("\n") { "${it.key} -> ${it.value}" } + + /** + * @return A detailed string containing the debug status of all mesh components. + */ + fun getDebugStatus(): String = buildString { + appendLine("=== Wi-Fi Aware Mesh Debug Status ===") + appendLine("My Peer ID: $myPeerID") + appendLine("Peers: ${peerSockets.keys}") + appendLine(peerManager.getDebugInfo(getDeviceAddressToPeerMapping())) + appendLine(fragmentManager.getDebugInfo()) + appendLine(securityManager.getDebugInfo()) + appendLine(storeForwardManager.getDebugInfo()) + appendLine(messageHandler.getDebugInfo()) + appendLine(packetProcessor.getDebugInfo()) + } + + /** Utility extension to safely close sockets. */ + private fun Socket.closeQuietly() = try { close() } catch (_: Exception) {} + + /** Utility extension to safely close server sockets. */ + private fun ServerSocket.closeQuietly() = try { close() } catch (_: Exception) {} +} + + +/** + * Delegate interface for mesh service callbacks (maintains exact same interface) + */ +interface WifiAwareMeshDelegate { + fun didReceiveMessage(message: BitchatMessage) + fun didUpdatePeerList(peers: List) + fun didReceiveChannelLeave(channel: String, fromPeer: String) + fun didReceiveDeliveryAck(messageID: String, recipientPeerID: String) + fun didReceiveReadReceipt(messageID: String, recipientPeerID: String) + fun decryptChannelMessage(encryptedContent: ByteArray, channel: String): String? + fun getNickname(): String? + fun isFavorite(peerID: String): Boolean + // registerPeerPublicKey REMOVED - fingerprints now handled centrally in PeerManager +} From fa1978d587ff38c4cdd3ba9d30cfa33e6294fb79 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Sat, 3 Jan 2026 23:37:49 +0700 Subject: [PATCH 07/10] Revert "fix: wifi aware socket binding (#533)" (#535) This reverts commit 0c7505b588b38b14f5b674ef6ec4d286cdb0f5c4. --- app/src/main/AndroidManifest.xml | 9 - .../com/bitchat/android/BitchatApplication.kt | 5 - .../java/com/bitchat/android/MainActivity.kt | 57 +- .../android/mesh/BluetoothMeshService.kt | 6 +- .../onboarding/OnboardingCoordinator.kt | 1 - .../onboarding/PermissionExplanationScreen.kt | 2 - .../android/onboarding/PermissionManager.kt | 20 - .../android/service/MeshServiceHolder.kt | 6 - .../bitchat/android/services/MessageRouter.kt | 17 +- .../com/bitchat/android/ui/ChatViewModel.kt | 24 +- .../bitchat/android/ui/MediaSendingManager.kt | 2 - .../bitchat/android/ui/MeshDelegateHandler.kt | 5 +- .../bitchat/android/ui/SidebarComponents.kt | 21 +- .../ui/debug/DebugPreferenceManager.kt | 27 +- .../android/ui/debug/DebugSettingsManager.kt | 46 - .../android/ui/debug/DebugSettingsSheet.kt | 98 +- .../android/wifi-aware/WifiAwareController.kt | 116 -- .../wifi-aware/WifiAwareMeshService.kt | 1277 ----------------- 18 files changed, 17 insertions(+), 1722 deletions(-) delete mode 100644 app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt delete mode 100644 app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e79fa8eb..f4ca2b89 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,6 @@ - @@ -20,12 +19,6 @@ - - - - - - @@ -54,8 +47,6 @@ - - - val svc = com.bitchat.android.wifiaware.WifiAwareController.getService() - if (running && svc != null) { - svc.delegate = object : com.bitchat.android.wifiaware.WifiAwareMeshDelegate { - override fun didReceiveMessage(message: com.bitchat.android.model.BitchatMessage) { - if (message.isPrivate) { - message.senderPeerID?.let { pid -> com.bitchat.android.services.AppStateStore.addPrivateMessage(pid, message) } - } else if (message.channel != null) { - com.bitchat.android.services.AppStateStore.addChannelMessage(message.channel, message) - } else { - com.bitchat.android.services.AppStateStore.addPublicMessage(message) - } - chatViewModel.didReceiveMessage(message) - } - override fun didUpdatePeerList(peers: List) { - chatViewModel.didUpdatePeerList(peers) - } - override fun didReceiveChannelLeave(channel: String, fromPeer: String) { - chatViewModel.didReceiveChannelLeave(channel, fromPeer) - } - override fun didReceiveDeliveryAck(messageID: String, recipientPeerID: String) { - chatViewModel.didReceiveDeliveryAck(messageID, recipientPeerID) - } - override fun didReceiveReadReceipt(messageID: String, recipientPeerID: String) { - chatViewModel.didReceiveReadReceipt(messageID, recipientPeerID) - } - override fun decryptChannelMessage(encryptedContent: ByteArray, channel: String): String? { - return chatViewModel.decryptChannelMessage(encryptedContent, channel) - } - override fun getNickname(): String? { - return chatViewModel.getNickname() - } - override fun isFavorite(peerID: String): Boolean { - return try { - com.bitchat.android.favorites.FavoritesPersistenceService.shared.getFavoriteStatus(peerID)?.isMutual == true - } catch (_: Exception) { false } - } - } - } - } - } - } // Only start onboarding process if we're in the initial CHECKING state // This prevents restarting onboarding on configuration changes @@ -395,12 +347,6 @@ class MainActivity : OrientationAwareActivity() { bluetoothStatusManager.logBluetoothStatus() mainViewModel.updateBluetoothStatus(bluetoothStatusManager.checkBluetoothStatus()) - val bleRequired = try { com.bitchat.android.ui.debug.DebugPreferenceManager.getBleEnabled(true) } catch (_: Exception) { true } - if (!bleRequired) { - // Skip BLE checks entirely when BLE is disabled in debug settings - checkLocationAndProceed() - return - } when (mainViewModel.bluetoothStatus.value) { BluetoothStatus.ENABLED -> { // Bluetooth is enabled, check location services next @@ -567,9 +513,8 @@ class MainActivity : OrientationAwareActivity() { else -> BatteryOptimizationStatus.ENABLED } - val bleRequired2 = try { com.bitchat.android.ui.debug.DebugPreferenceManager.getBleEnabled(true) } catch (_: Exception) { true } when { - bleRequired2 && currentBluetoothStatus != BluetoothStatus.ENABLED -> { + currentBluetoothStatus != BluetoothStatus.ENABLED -> { // Bluetooth still disabled, but now we have permissions to enable it Log.d("MainActivity", "Permissions granted, but Bluetooth still disabled. Showing Bluetooth enable screen.") mainViewModel.updateBluetoothStatus(currentBluetoothStatus) diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt index c48ce087..3de48407 100644 --- a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt +++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt @@ -94,9 +94,6 @@ class BluetoothMeshService(private val context: Context) { } catch (_: Exception) { 0.01 } } ) - - // Register as shared instance for Wi-Fi Aware transport - com.bitchat.android.service.MeshServiceHolder.setGossipManager(gossipSyncManager) // Wire sync manager delegate gossipSyncManager.delegate = object : GossipSyncManager.Delegate { @@ -271,8 +268,7 @@ class BluetoothMeshService(private val context: Context) { override fun sendPacket(packet: BitchatPacket) { // Sign the packet before broadcasting val signedPacket = signPacketBeforeBroadcast(packet) - val routed = RoutedPacket(signedPacket) - connectionManager.broadcastPacket(routed) + connectionManager.broadcastPacket(RoutedPacket(signedPacket)) } override fun relayPacket(routed: RoutedPacket) { diff --git a/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt b/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt index ba4da701..871cc892 100644 --- a/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt +++ b/app/src/main/java/com/bitchat/android/onboarding/OnboardingCoordinator.kt @@ -209,7 +209,6 @@ class OnboardingCoordinator( return when { permission.contains("BLUETOOTH") -> "Bluetooth/Nearby Devices" permission.contains("LOCATION") -> "Location (for Bluetooth scanning)" - permission.contains("NEARBY_WIFI") -> "Nearby Wi‑Fi Devices (for Wi‑Fi Aware)" permission.contains("NOTIFICATION") -> "Notifications" else -> permission.substringAfterLast(".") } diff --git a/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt b/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt index c00f35f3..2b84aefa 100644 --- a/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt +++ b/app/src/main/java/com/bitchat/android/onboarding/PermissionExplanationScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.filled.Power import androidx.compose.material.icons.filled.Mic import androidx.compose.material.icons.filled.Security -import androidx.compose.material.icons.filled.Wifi import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Warning import androidx.compose.material3.* @@ -243,7 +242,6 @@ private fun getPermissionIcon(permissionType: PermissionType): ImageVector { PermissionType.PRECISE_LOCATION -> Icons.Filled.LocationOn PermissionType.MICROPHONE -> Icons.Filled.Mic PermissionType.NOTIFICATIONS -> Icons.Filled.Notifications - PermissionType.WIFI_AWARE -> Icons.Filled.Wifi PermissionType.BATTERY_OPTIMIZATION -> Icons.Filled.Power PermissionType.OTHER -> Icons.Filled.Settings } diff --git a/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt b/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt index aedf85f8..ff0a160f 100644 --- a/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt +++ b/app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt @@ -67,11 +67,6 @@ class PermissionManager(private val context: Context) { Manifest.permission.ACCESS_FINE_LOCATION )) - // Wi‑Fi Aware: Android 13+ requires NEARBY_WIFI_DEVICES runtime permission - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - permissions.add(Manifest.permission.NEARBY_WIFI_DEVICES) - } - // Notification permission intentionally excluded to keep it optional return permissions @@ -182,20 +177,6 @@ class PermissionManager(private val context: Context) { ) ) - // Wi‑Fi Aware category (Android 13+) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - val wifiAwarePermissions = listOf(Manifest.permission.NEARBY_WIFI_DEVICES) - categories.add( - PermissionCategory( - type = PermissionType.WIFI_AWARE, - description = "Enable Wi‑Fi Aware to discover and connect to nearby bitchat users over Wi‑Fi.", - permissions = wifiAwarePermissions, - isGranted = wifiAwarePermissions.all { isPermissionGranted(it) }, - systemDescription = "Allow bitchat to discover nearby Wi‑Fi devices" - ) - ) - } - // Notifications category (if applicable) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { categories.add( @@ -281,7 +262,6 @@ enum class PermissionType(val nameValue: String) { PRECISE_LOCATION("Precise Location"), MICROPHONE("Microphone"), NOTIFICATIONS("Notifications"), - WIFI_AWARE("Wi‑Fi Aware"), BATTERY_OPTIMIZATION("Battery Optimization"), OTHER("Other") } diff --git a/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt b/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt index 71dddb66..d271ab29 100644 --- a/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt +++ b/app/src/main/java/com/bitchat/android/service/MeshServiceHolder.kt @@ -9,12 +9,6 @@ import com.bitchat.android.mesh.BluetoothMeshService */ object MeshServiceHolder { private const val TAG = "MeshServiceHolder" - @Volatile - var sharedGossipSyncManager: com.bitchat.android.sync.GossipSyncManager? = null - private set - - fun setGossipManager(mgr: com.bitchat.android.sync.GossipSyncManager) { sharedGossipSyncManager = mgr } - @Volatile var meshService: BluetoothMeshService? = null private set diff --git a/app/src/main/java/com/bitchat/android/services/MessageRouter.kt b/app/src/main/java/com/bitchat/android/services/MessageRouter.kt index 53db2fa6..8166487e 100644 --- a/app/src/main/java/com/bitchat/android/services/MessageRouter.kt +++ b/app/src/main/java/com/bitchat/android/services/MessageRouter.kt @@ -72,15 +72,9 @@ class MessageRouter private constructor( val hasMesh = mesh.getPeerInfo(toPeerID)?.isConnected == true val hasEstablished = mesh.hasEstablishedSession(toPeerID) - // Check Wi‑Fi Aware availability as a secondary transport - val aware = try { com.bitchat.android.wifiaware.WifiAwareController.getService() } catch (_: Exception) { null } - val hasAware = try { aware?.getPeerInfo(toPeerID)?.isConnected == true && aware.hasEstablishedSession(toPeerID) } catch (_: Exception) { false } if (hasMesh && hasEstablished) { Log.d(TAG, "Routing PM via mesh to ${toPeerID} msg_id=${messageID.take(8)}…") mesh.sendPrivateMessage(content, toPeerID, recipientNickname, messageID) - } else if (hasAware) { - Log.d(TAG, "Routing PM via Wi‑Fi Aware to ${toPeerID} msg_id=${messageID.take(8)}…") - aware?.sendPrivateMessage(content, toPeerID, recipientNickname, messageID) } else if (canSendViaNostr(toPeerID)) { Log.d(TAG, "Routing PM via Nostr to ${toPeerID.take(32)}… msg_id=${messageID.take(8)}…") nostr.sendPrivateMessage(content, toPeerID, recipientNickname, messageID) @@ -89,21 +83,14 @@ class MessageRouter private constructor( val q = outbox.getOrPut(toPeerID) { mutableListOf() } q.add(Triple(content, recipientNickname, messageID)) Log.d(TAG, "Initiating noise handshake after queueing PM for ${toPeerID.take(8)}…") - if (hasMesh) mesh.initiateNoiseHandshake(toPeerID) else aware?.initiateNoiseHandshake(toPeerID) + mesh.initiateNoiseHandshake(toPeerID) } } fun sendReadReceipt(receipt: ReadReceipt, toPeerID: String) { - val aware = try { com.bitchat.android.wifiaware.WifiAwareController.getService() } catch (_: Exception) { null } - val viaMesh = (mesh.getPeerInfo(toPeerID)?.isConnected == true) && mesh.hasEstablishedSession(toPeerID) - val viaAware = try { aware?.getPeerInfo(toPeerID)?.isConnected == true && aware.hasEstablishedSession(toPeerID) } catch (_: Exception) { false } - if (viaMesh) { + if ((mesh.getPeerInfo(toPeerID)?.isConnected == true) && mesh.hasEstablishedSession(toPeerID)) { Log.d(TAG, "Routing READ via mesh to ${toPeerID.take(8)}… id=${receipt.originalMessageID.take(8)}…") mesh.sendReadReceipt(receipt.originalMessageID, toPeerID, mesh.getPeerNicknames()[toPeerID] ?: mesh.myPeerID) - } else if (viaAware) { - Log.d(TAG, "Routing READ via Wi‑Fi Aware to ${toPeerID.take(8)}… id=${receipt.originalMessageID.take(8)}…") - val me = try { aware?.myPeerID } catch (_: Exception) { null } - aware?.sendReadReceipt(receipt.originalMessageID, toPeerID, me ?: "") } else { Log.d(TAG, "Routing READ via Nostr to ${toPeerID.take(8)}… id=${receipt.originalMessageID.take(8)}…") nostr.sendReadReceipt(receipt, toPeerID) diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt index 22345923..1196396d 100644 --- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt +++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt @@ -441,9 +441,8 @@ class ChatViewModel( state.getNicknameValue() ) } else { - // Default: route via mesh + Wi‑Fi Aware + // Default: route via mesh meshService.sendMessage(messageContent, mentions, channel) - try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(messageContent, mentions, channel) } catch (_: Exception) {} } }) return @@ -513,23 +512,19 @@ class ChatViewModel( state.getNicknameValue(), meshService.myPeerID, onEncryptedPayload = { encryptedData -> - // Send encrypted payload announcement over both transports for reachability + // This would need proper mesh service integration meshService.sendMessage(content, mentions, currentChannelValue) - try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, currentChannelValue) } catch (_: Exception) {} }, onFallback = { meshService.sendMessage(content, mentions, currentChannelValue) - try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, currentChannelValue) } catch (_: Exception) {} } ) } else { meshService.sendMessage(content, mentions, currentChannelValue) - try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, currentChannelValue) } catch (_: Exception) {} } } else { messageManager.addMessage(message) meshService.sendMessage(content, mentions, null) - try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendMessage(content, mentions, null) } catch (_: Exception) {} } } } @@ -652,23 +647,16 @@ class ChatViewModel( val fingerprints = privateChatManager.getAllPeerFingerprints() state.setPeerFingerprints(fingerprints) - // Merge nicknames from BLE and Wi‑Fi Aware to display names for all peers - val bleNick = meshService.getPeerNicknames() - val awareNickRaw = try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.getPeerNicknamesMap() } catch (_: Exception) { null } - val mergedNick = if (awareNickRaw != null) bleNick + awareNickRaw.filter { it.value != null }.mapValues { it.value!! }.filterKeys { it !in bleNick || bleNick[it].isNullOrBlank() } else bleNick - state.setPeerNicknames(mergedNick) + val nicknames = meshService.getPeerNicknames() + state.setPeerNicknames(nicknames) val rssiValues = meshService.getPeerRSSI() - val awareRssi = try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.getPeerRSSI() } catch (_: Exception) { null } - val mergedRssi = if (awareRssi != null) rssiValues + awareRssi.filterKeys { it !in rssiValues } else rssiValues - state.setPeerRSSI(mergedRssi) + state.setPeerRSSI(rssiValues) // Update directness per peer (driven by PeerManager state) try { val directMap = state.getConnectedPeersValue().associateWith { pid -> - val ble = meshService.getPeerInfo(pid)?.isDirectConnection == true - val aware = try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.getPeerInfo(pid)?.isDirectConnection == true } catch (_: Exception) { false } - ble || aware + meshService.getPeerInfo(pid)?.isDirectConnection == true } state.setPeerDirect(directMap) } catch (_: Exception) { } diff --git a/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt b/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt index fc134a1b..a3def523 100644 --- a/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt +++ b/app/src/main/java/com/bitchat/android/ui/MediaSendingManager.kt @@ -210,7 +210,6 @@ class MediaSendingManager( Log.d(TAG, "📤 Calling meshService.sendFilePrivate to $toPeerID") meshService.sendFilePrivate(toPeerID, filePacket) - try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendFilePrivate(toPeerID, filePacket) } catch (_: Exception) {} Log.d(TAG, "✅ File send completed successfully") } @@ -265,7 +264,6 @@ class MediaSendingManager( Log.d(TAG, "📤 Calling meshService.sendFileBroadcast") meshService.sendFileBroadcast(filePacket) - try { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendFileBroadcast(filePacket) } catch (_: Exception) {} Log.d(TAG, "✅ File broadcast completed successfully") } diff --git a/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt b/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt index 6e7d5d22..a452616e 100644 --- a/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt +++ b/app/src/main/java/com/bitchat/android/ui/MeshDelegateHandler.kt @@ -96,10 +96,7 @@ class MeshDelegateHandler( override fun didUpdatePeerList(peers: List) { coroutineScope.launch { - // Merge peers from multiple transports to avoid flapping - val current = state.getConnectedPeersValue().toMutableSet() - current.addAll(peers) - state.setConnectedPeers(current.toList()) + state.setConnectedPeers(peers) state.setIsConnected(peers.isNotEmpty()) notificationManager.showActiveUserNotification(peers) // Flush router outbox for any peers that just connected (and their noiseHex aliases) diff --git a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt index c504b9f9..4ab4360a 100644 --- a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt +++ b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt @@ -576,26 +576,9 @@ private fun PeerItem( tint = Color.Gray ) } else { - val awareConnected by com.bitchat.android.wifiaware.WifiAwareController.connectedPeers.collectAsState() - val awareDiscovered by com.bitchat.android.wifiaware.WifiAwareController.discoveredPeers.collectAsState() - val isWifiDirect = awareConnected.containsKey(peerID) - val isBleDirect = isDirect - val icon = when { - isWifiDirect -> Icons.Filled.Wifi - isBleDirect -> Icons.Outlined.SettingsInputAntenna - // Routed: show Route icon; optionally prefer Wi‑Fi Aware if discovered there - awareDiscovered.contains(peerID) -> Icons.Filled.WifiTethering - else -> Icons.Filled.Route - } - val cd = when { - isWifiDirect -> "Direct Wi‑Fi Aware" - isBleDirect -> "Direct Bluetooth" - awareDiscovered.contains(peerID) -> "Routed over Wi‑Fi" - else -> "Routed" - } Icon( - imageVector = icon, - contentDescription = cd, + imageVector = if (isDirect) Icons.Outlined.SettingsInputAntenna else Icons.Filled.Route, + contentDescription = if (isDirect) "Direct Bluetooth" else "Routed", modifier = Modifier.size(16.dp), tint = colorScheme.onSurface.copy(alpha = 0.8f) ) diff --git a/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt b/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt index 2d734c14..04ad48a2 100644 --- a/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt +++ b/app/src/main/java/com/bitchat/android/ui/debug/DebugPreferenceManager.kt @@ -20,10 +20,7 @@ object DebugPreferenceManager { // GCS keys (no migration/back-compat) private const val KEY_GCS_MAX_BYTES = "gcs_max_filter_bytes" private const val KEY_GCS_FPR = "gcs_filter_fpr_percent" - // Transport master toggles - private const val KEY_BLE_ENABLED = "ble_enabled" - private const val KEY_WIFI_AWARE_ENABLED = "wifi_aware_enabled" - private const val KEY_WIFI_AWARE_VERBOSE = "wifi_aware_verbose" + // Removed: persistent notification toggle is now governed by MeshServicePreferences.isBackgroundEnabled private lateinit var prefs: SharedPreferences @@ -105,25 +102,5 @@ object DebugPreferenceManager { if (ready()) prefs.edit().putLong(KEY_GCS_FPR, java.lang.Double.doubleToRawLongBits(value)).apply() } - // Transport toggles - fun getBleEnabled(default: Boolean = true): Boolean = - if (ready()) prefs.getBoolean(KEY_BLE_ENABLED, default) else default - - fun setBleEnabled(value: Boolean) { - if (ready()) prefs.edit().putBoolean(KEY_BLE_ENABLED, value).apply() - } - - fun getWifiAwareEnabled(default: Boolean = false): Boolean = - if (ready()) prefs.getBoolean(KEY_WIFI_AWARE_ENABLED, default) else default - - fun setWifiAwareEnabled(value: Boolean) { - if (ready()) prefs.edit().putBoolean(KEY_WIFI_AWARE_ENABLED, value).apply() - } - - fun getWifiAwareVerbose(default: Boolean = false): Boolean = - if (ready()) prefs.getBoolean(KEY_WIFI_AWARE_VERBOSE, default) else default - - fun setWifiAwareVerbose(value: Boolean) { - if (ready()) prefs.edit().putBoolean(KEY_WIFI_AWARE_VERBOSE, value).apply() - } + // No longer storing persistent notification in debug prefs. } diff --git a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt index 669331e6..77f6ce12 100644 --- a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt +++ b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsManager.kt @@ -36,17 +36,6 @@ class DebugSettingsManager private constructor() { private val _packetRelayEnabled = MutableStateFlow(true) val packetRelayEnabled: StateFlow = _packetRelayEnabled.asStateFlow() - // Master transport toggles - private val _bleEnabled = MutableStateFlow(true) - val bleEnabled: StateFlow = _bleEnabled.asStateFlow() - - private val _wifiAwareEnabled = MutableStateFlow(false) - val wifiAwareEnabled: StateFlow = _wifiAwareEnabled.asStateFlow() - - // Master transport toggles - private val _wifiAwareVerbose = MutableStateFlow(false) - val wifiAwareVerbose: StateFlow = _wifiAwareVerbose.asStateFlow() - // Visibility of the debug sheet; gates heavy work private val _debugSheetVisible = MutableStateFlow(false) val debugSheetVisible: StateFlow = _debugSheetVisible.asStateFlow() @@ -70,10 +59,6 @@ class DebugSettingsManager private constructor() { _maxConnectionsOverall.value = DebugPreferenceManager.getMaxConnectionsOverall(8) _maxServerConnections.value = DebugPreferenceManager.getMaxConnectionsServer(8) _maxClientConnections.value = DebugPreferenceManager.getMaxConnectionsClient(8) - // Transport toggles - _bleEnabled.value = DebugPreferenceManager.getBleEnabled(true) - _wifiAwareEnabled.value = DebugPreferenceManager.getWifiAwareEnabled(false) - _wifiAwareVerbose.value = DebugPreferenceManager.getWifiAwareVerbose(false) } catch (_: Exception) { // Preferences not ready yet; keep defaults. They will be applied on first change. } @@ -277,27 +262,6 @@ class DebugSettingsManager private constructor() { )) } - fun setBleEnabled(enabled: Boolean) { - DebugPreferenceManager.setBleEnabled(enabled) - _bleEnabled.value = enabled - addDebugMessage(DebugMessage.SystemMessage(if (enabled) "🟢 BLE enabled" else "🔴 BLE disabled")) - } - - fun setWifiAwareEnabled(enabled: Boolean) { - DebugPreferenceManager.setWifiAwareEnabled(enabled) - _wifiAwareEnabled.value = enabled - addDebugMessage(DebugMessage.SystemMessage(if (enabled) "🟢 Wi‑Fi Aware enabled" else "🔴 Wi‑Fi Aware disabled")) - try { - com.bitchat.android.wifiaware.WifiAwareController.setEnabled(enabled) - } catch (_: Exception) { } - } - - fun setWifiAwareVerbose(enabled: Boolean) { - DebugPreferenceManager.setWifiAwareVerbose(enabled) - _wifiAwareVerbose.value = enabled - addDebugMessage(DebugMessage.SystemMessage(if (enabled) "🔊 Wi‑Fi Aware verbose logging enabled" else "🔇 Wi‑Fi Aware verbose logging disabled")) - } - fun setMaxConnectionsOverall(value: Int) { val clamped = value.coerceIn(1, 32) DebugPreferenceManager.setMaxConnectionsOverall(clamped) @@ -355,16 +319,6 @@ class DebugSettingsManager private constructor() { fun updateConnectedDevices(devices: List) { _connectedDevices.value = devices } - - // Wi‑Fi Aware debug collections - private val _wifiAwareDiscovered = MutableStateFlow>(emptyMap()) // peerID->nickname - val wifiAwareDiscovered: StateFlow> = _wifiAwareDiscovered.asStateFlow() - - private val _wifiAwareConnected = MutableStateFlow>(emptyMap()) // peerID->ip - val wifiAwareConnected: StateFlow> = _wifiAwareConnected.asStateFlow() - - fun updateWifiAwareDiscovered(map: Map) { _wifiAwareDiscovered.value = map } - fun updateWifiAwareConnected(map: Map) { _wifiAwareConnected.value = map } fun updateRelayStats(stats: PacketRelayStats) { _relayStats.value = stats diff --git a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt index 94781b31..4b9f983a 100644 --- a/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt +++ b/app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt @@ -10,8 +10,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Bluetooth -import androidx.compose.material.icons.filled.Wifi -import androidx.compose.material.icons.filled.WifiTethering import androidx.compose.material.icons.filled.BugReport import androidx.compose.material.icons.filled.Cancel import androidx.compose.material.icons.filled.Devices @@ -52,7 +50,7 @@ fun DebugSettingsSheet( val verboseLogging by manager.verboseLoggingEnabled.collectAsState() val gattServerEnabled by manager.gattServerEnabled.collectAsState() val gattClientEnabled by manager.gattClientEnabled.collectAsState() - val packetRelayed by manager.packetRelayEnabled.collectAsState() + val packetRelayEnabled by manager.packetRelayEnabled.collectAsState() val maxOverall by manager.maxConnectionsOverall.collectAsState() val maxServer by manager.maxServerConnections.collectAsState() val maxClient by manager.maxClientConnections.collectAsState() @@ -64,12 +62,6 @@ fun DebugSettingsSheet( val gcsMaxBytes by manager.gcsMaxBytes.collectAsState() val gcsFpr by manager.gcsFprPercent.collectAsState() val context = LocalContext.current - - val bleEnabled by manager.bleEnabled.collectAsState() - val wifiAwareEnabled by manager.wifiAwareEnabled.collectAsState() - val wifiAwareVerbose by manager.wifiAwareVerbose.collectAsState() - val wifiAwareDiscovered by manager.wifiAwareDiscovered.collectAsState() - val wifiAwareConnected by manager.wifiAwareConnected.collectAsState() // Persistent notification is now controlled solely by MeshServicePreferences.isBackgroundEnabled // Push live connected devices from mesh service whenever sheet is visible @@ -94,15 +86,6 @@ fun DebugSettingsSheet( ) } manager.updateConnectedDevices(devices) - // Also surface Wi‑Fi Aware status - try { - val ctrl = com.bitchat.android.wifiaware.WifiAwareController - val known = ctrl.knownPeers.value - val discovered = ctrl.discoveredPeers.value - val discoveredMap = discovered.associateWith { pid -> known[pid] ?: "" } - manager.updateWifiAwareDiscovered(discoveredMap) - manager.updateWifiAwareConnected(ctrl.connectedPeers.value) - } catch (_: Exception) { } kotlinx.coroutines.delay(1000) } } @@ -230,46 +213,6 @@ fun DebugSettingsSheet( } } - // Transport toggles (BLE + Wi‑Fi Aware) - item { - Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { - Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Icon(Icons.Filled.Devices, contentDescription = null, tint = Color(0xFF4CAF50)) - Text("Transports", fontFamily = FontFamily.Monospace, fontSize = 14.sp, fontWeight = FontWeight.Medium) - } - Row(verticalAlignment = Alignment.CenterVertically) { - Icon(Icons.Filled.Bluetooth, contentDescription = null, tint = Color(0xFF007AFF)) - Spacer(Modifier.width(8.dp)) - Text("BLE", fontFamily = FontFamily.Monospace, modifier = Modifier.weight(1f)) - Switch(checked = bleEnabled, onCheckedChange = { - manager.setBleEnabled(it) - scope.launch { - if (it) { - if (gattServerEnabled) meshService.connectionManager.startServer() - if (gattClientEnabled) meshService.connectionManager.startClient() - } else { - meshService.connectionManager.stopServer() - meshService.connectionManager.stopClient() - } - } - }) - } - Row(verticalAlignment = Alignment.CenterVertically) { - Icon(Icons.Filled.Wifi, contentDescription = null, tint = Color(0xFF9C27B0)) - Spacer(Modifier.width(8.dp)) - Text("Wi‑Fi Aware", fontFamily = FontFamily.Monospace, modifier = Modifier.weight(1f)) - Switch(checked = wifiAwareEnabled, onCheckedChange = { manager.setWifiAwareEnabled(it) }) - } - Row(verticalAlignment = Alignment.CenterVertically) { - Spacer(Modifier.width(24.dp)) - Text("Wi‑Fi Aware verbose", fontFamily = FontFamily.Monospace, modifier = Modifier.weight(1f)) - Switch(checked = wifiAwareVerbose, onCheckedChange = { manager.setWifiAwareVerbose(it) }) - } - } - } - } - // Packet relay controls and stats item { Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { @@ -280,7 +223,7 @@ fun DebugSettingsSheet( Icon(Icons.Filled.PowerSettingsNew, contentDescription = null, tint = Color(0xFFFF9500)) Text(stringResource(R.string.debug_packet_relay), fontFamily = FontFamily.Monospace, fontSize = 14.sp, fontWeight = FontWeight.Medium) Spacer(Modifier.weight(1f)) - Switch(checked = packetRelayed, onCheckedChange = { manager.setPacketRelayEnabled(it) }) + Switch(checked = packetRelayEnabled, onCheckedChange = { manager.setPacketRelayEnabled(it) }) } // Removed aggregate labels; we will show per-direction compact labels below titles // Toggle: overall vs per-connection vs per-peer @@ -529,43 +472,6 @@ fun DebugSettingsSheet( } } - // Wi‑Fi Aware controls and status - item { - Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { - Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Icon(Icons.Filled.WifiTethering, contentDescription = null, tint = Color(0xFF9C27B0)) - Text("Wi‑Fi Aware", fontFamily = FontFamily.Monospace, fontSize = 14.sp, fontWeight = FontWeight.Medium) - Spacer(Modifier.weight(1f)) - val running by com.bitchat.android.wifiaware.WifiAwareController.running.collectAsState() - Text(if (running) "running" else "stopped", fontFamily = FontFamily.Monospace, fontSize = 12.sp, color = colorScheme.onSurface.copy(alpha = 0.7f)) - } - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - AssistChip(onClick = { com.bitchat.android.wifiaware.WifiAwareController.startIfPossible() }, label = { Text("Start") }) - AssistChip(onClick = { com.bitchat.android.wifiaware.WifiAwareController.stop() }, label = { Text("Stop") }) - AssistChip(onClick = { com.bitchat.android.wifiaware.WifiAwareController.getService()?.sendBroadcastAnnounce() }, label = { Text("Announce") }) - } - Text("Discovered: ${wifiAwareDiscovered.size}", fontFamily = FontFamily.Monospace, fontSize = 12.sp) - if (wifiAwareDiscovered.isEmpty()) { - Text("No discoveries yet", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.6f)) - } else { - wifiAwareDiscovered.entries.take(50).forEach { (peer, nick) -> - Text("• ${if (nick.isBlank()) peer.take(8) + "…" else nick} (${peer.take(8)}…) ", fontFamily = FontFamily.Monospace, fontSize = 12.sp) - } - } - Divider() - Text("Connected: ${wifiAwareConnected.size}", fontFamily = FontFamily.Monospace, fontSize = 12.sp) - if (wifiAwareConnected.isEmpty()) { - Text("No active sockets", fontFamily = FontFamily.Monospace, fontSize = 11.sp, color = colorScheme.onSurface.copy(alpha = 0.6f)) - } else { - wifiAwareConnected.entries.take(50).forEach { (peer, ip) -> - Text("• ${peer.take(8)}… @ $ip", fontFamily = FontFamily.Monospace, fontSize = 12.sp) - } - } - } - } - } - // Connected devices item { Surface(shape = RoundedCornerShape(12.dp), color = colorScheme.surfaceVariant.copy(alpha = 0.2f)) { diff --git a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt deleted file mode 100644 index d10c6741..00000000 --- a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareController.kt +++ /dev/null @@ -1,116 +0,0 @@ -package com.bitchat.android.wifiaware - -import android.content.Context -import android.os.Build -import android.util.Log -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.cancel -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.isActive -import kotlinx.coroutines.launch - -/** - * WifiAwareController manages lifecycle and debug surfacing for the WifiAwareMeshService. - * It starts/stops the service based on debug preferences and exposes simple flows for UI. - */ -object WifiAwareController { - private const val TAG = "WifiAwareController" - - private var service: WifiAwareMeshService? = null - private var appContext: Context? = null - - private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) - - private val _enabled = MutableStateFlow(false) - val enabled: StateFlow = _enabled.asStateFlow() - - private val _running = MutableStateFlow(false) - val running: StateFlow = _running.asStateFlow() - - // Simple debug surfacing - private val _connectedPeers = MutableStateFlow>(emptyMap()) // peerID -> ip - val connectedPeers: StateFlow> = _connectedPeers.asStateFlow() - - private val _knownPeers = MutableStateFlow>(emptyMap()) // peerID -> nickname - val knownPeers: StateFlow> = _knownPeers.asStateFlow() - - private val _discoveredPeers = MutableStateFlow>(emptySet()) - val discoveredPeers: StateFlow> = _discoveredPeers.asStateFlow() - - fun initialize(context: Context, enabledByDefault: Boolean) { - appContext = context.applicationContext - setEnabled(enabledByDefault) - // Start background poller for debug surfacing - scope.launch { - while (isActive) { - try { - val s = service - if (s != null) { - _connectedPeers.value = s.getDeviceAddressToPeerMapping() // peerID -> ip - _knownPeers.value = s.getPeerNicknames() - _discoveredPeers.value = s.getDiscoveredPeerIds() - } else { - _connectedPeers.value = emptyMap() - _knownPeers.value = emptyMap() - _discoveredPeers.value = emptySet() - } - } catch (_: Exception) { } - delay(1000) - } - } - } - - fun setEnabled(value: Boolean) { - _enabled.value = value - if (value) startIfPossible() else stop() - } - - fun startIfPossible() { - if (_running.value) return - val ctx = appContext ?: return - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { - Log.w(TAG, "Wi‑Fi Aware requires Android 10 (Q)+; disabled.") - try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware not supported on this device (requires Android 10+)")) } catch (_: Exception) {} - return - } - // Android 13+: require NEARBY_WIFI_DEVICES runtime permission - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - val granted = androidx.core.content.ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.NEARBY_WIFI_DEVICES) == android.content.pm.PackageManager.PERMISSION_GRANTED - if (!granted) { - Log.w(TAG, "Missing NEARBY_WIFI_DEVICES permission; not starting Wi‑Fi Aware") - try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Grant Nearby Wi‑Fi Devices to start Wi‑Fi Aware")) } catch (_: Exception) {} - return - } - } - try { - service = WifiAwareMeshService(ctx).also { - it.startServices() - _running.value = true - try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware started")) } catch (_: Exception) {} - } - } catch (e: Throwable) { - Log.e(TAG, "Failed to start WifiAwareMeshService", e) - _running.value = false - try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware failed to start: ${e.message}")) } catch (_: Exception) {} - } - } - - fun stop() { - try { service?.stopServices() } catch (_: Exception) { } - service = null - _running.value = false - try { com.bitchat.android.ui.debug.DebugSettingsManager.getInstance().addDebugMessage(com.bitchat.android.ui.debug.DebugMessage.SystemMessage("Wi‑Fi Aware stopped")) } catch (_: Exception) {} - } - - fun getService(): WifiAwareMeshService? = service - - // Optional bridge to BLE mesh for cross-transport relaying - @Volatile private var bleMesh: com.bitchat.android.mesh.BluetoothMeshService? = null - fun setBleMeshService(svc: com.bitchat.android.mesh.BluetoothMeshService) { bleMesh = svc } - fun getBleMeshService(): com.bitchat.android.mesh.BluetoothMeshService? = bleMesh -} diff --git a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt deleted file mode 100644 index f895a7cb..00000000 --- a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshService.kt +++ /dev/null @@ -1,1277 +0,0 @@ -package com.bitchat.android.wifiaware - -import android.Manifest -import android.annotation.SuppressLint -import android.content.Context -import android.net.* -import android.net.wifi.aware.* -import android.os.Build -import android.os.Handler -import android.os.Looper -import android.util.Log -import androidx.annotation.RequiresApi -import androidx.annotation.RequiresPermission -import com.bitchat.android.crypto.EncryptionService -import com.bitchat.android.model.* -import com.bitchat.android.protocol.* -import com.bitchat.android.sync.GossipSyncManager -import com.bitchat.android.util.toHexString -// Mesh-layer components are reused from the existing Bluetooth stack -import com.bitchat.android.mesh.PeerManager -import com.bitchat.android.mesh.PeerManagerDelegate -import com.bitchat.android.mesh.PeerInfo -import com.bitchat.android.mesh.FragmentManager -import com.bitchat.android.mesh.SecurityManager -import com.bitchat.android.mesh.SecurityManagerDelegate -import com.bitchat.android.mesh.StoreForwardManager -import com.bitchat.android.mesh.StoreForwardManagerDelegate -import com.bitchat.android.mesh.MessageHandler -import com.bitchat.android.mesh.MessageHandlerDelegate -import com.bitchat.android.mesh.PacketProcessor -import com.bitchat.android.mesh.PacketProcessorDelegate -import kotlinx.coroutines.* -import java.io.IOException -import java.net.Inet6Address -import java.net.ServerSocket -import java.net.Socket -import java.nio.ByteBuffer -import java.nio.ByteOrder -import java.util.UUID -import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.Executors - -/** - * WifiAware mesh service - LATEST - * - * This is now a coordinator that orchestrates the following components: - * - PeerManager: Peer lifecycle management - * - FragmentManager: Message fragmentation and reassembly - * - SecurityManager: Security, duplicate detection, encryption - * - StoreForwardManager: Offline message caching - * - MessageHandler: Message type processing and relay logic - * - PacketProcessor: Incoming packet routing - */ -class WifiAwareMeshService(private val context: Context) { - - companion object { - private const val TAG = "WifiAwareMeshService" - private const val MAX_TTL: UByte = 7u - private const val SERVICE_NAME = "bitchat" - private const val PSK = "bitchat_secret" - } - - // Core crypto/services - private val encryptionService = EncryptionService(context) - - // Peer ID must match BluetoothMeshService: first 16 hex chars of identity fingerprint (8 bytes) - val myPeerID: String = encryptionService.getIdentityFingerprint().take(16) - - // Core components - private val peerManager = PeerManager() - private val fragmentManager = FragmentManager() - private val securityManager = SecurityManager(encryptionService, myPeerID) - private val storeForwardManager = StoreForwardManager() - private val messageHandler = MessageHandler(myPeerID, context.applicationContext) - private val packetProcessor = PacketProcessor(myPeerID) - - // Gossip sync - private val gossipSyncManager: GossipSyncManager - - // Wi-Fi Aware transport - private val awareManager = context.getSystemService(WifiAwareManager::class.java) - private var wifiAwareSession: WifiAwareSession? = null - private var publishSession: PublishDiscoverySession? = null - private var subscribeSession: SubscribeDiscoverySession? = null - private val listenerExec = Executors.newCachedThreadPool() - private var isActive = false - - // Delegate - var delegate: WifiAwareMeshDelegate? = null - - // Transport state - private val peerSockets = ConcurrentHashMap() - private val serverSockets = ConcurrentHashMap() - private val networkCallbacks = ConcurrentHashMap() - private val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - private val handleToPeerId = ConcurrentHashMap() // discovery mapping - private val discoveredTimestamps = ConcurrentHashMap() // peerID -> last seen time - - // Timestamp dedupe - private val lastTimestamps = ConcurrentHashMap() - - // Coroutines - private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob()) - - init { - setupDelegates() - messageHandler.packetProcessor = packetProcessor - - // Use shared GossipSyncManager from MeshServiceHolder if available (minimal refactor) - val shared = com.bitchat.android.service.MeshServiceHolder.sharedGossipSyncManager - if (shared != null) { - gossipSyncManager = shared - } else { - gossipSyncManager = GossipSyncManager( - myPeerID = myPeerID, - scope = serviceScope, - configProvider = object : GossipSyncManager.ConfigProvider { - override fun seenCapacity(): Int = 500 - override fun gcsMaxBytes(): Int = 400 - override fun gcsTargetFpr(): Double = 0.01 - } - ) - gossipSyncManager.delegate = object : GossipSyncManager.Delegate { - override fun sendPacketToPeer(peerID: String, packet: BitchatPacket) { - this@WifiAwareMeshService.sendPacketToPeer(peerID, packet) - } - override fun sendPacket(packet: BitchatPacket) { - broadcastPacket(RoutedPacket(packet)) - } - override fun signPacketForBroadcast(packet: BitchatPacket): BitchatPacket { - return signPacketBeforeBroadcast(packet) - } - } - } - } - - /** - * Helper method hexToBa. - */ - private fun hexStringToByteArray(hex: String): ByteArray { - val out = ByteArray(8) - var idx = 0 - var s = hex - while (s.length >= 2 && idx < 8) { - val b = s.substring(0, 2).toIntOrNull(16)?.toByte() ?: 0 - out[idx++] = b - s = s.drop(2) - } - return out - } - - /** - * Sign packet before broadcasting. - */ - private fun signPacketBeforeBroadcast(packet: BitchatPacket): BitchatPacket { - val data = packet.toBinaryDataForSigning() ?: return packet - val sig = encryptionService.signData(data) ?: return packet - return packet.copy(signature = sig) - } - - /** - * Broadcasts raw bytes to currently connected peer. - */ - private fun broadcastRaw(bytes: ByteArray) { - var sent = 0 - peerSockets.forEach { (pid, sock) -> - try { - sock.getOutputStream().write(bytes) - sent++ - } catch (e: IOException) { - Log.e(TAG, "TX: write failed to ${pid.take(8)}: ${e.message}") - } - } - Log.i(TAG, "TX: broadcast via Wi-Fi Aware to $sent peers (bytes=${bytes.size})") - } - - /** - * Broadcasts routed packet to currently connected peers. - */ - private fun broadcastPacket(routed: RoutedPacket) { - Log.d(TAG, "TX: packet type=${routed.packet.type} broadcast (ttl=${routed.packet.ttl})") - // Wi-Fi Aware uses full packets; no fragmentation - val data = routed.packet.toBinaryData() ?: return - serviceScope.launch { broadcastRaw(data) } - } - - // Expose a public method so BLE can forward relays to Wi-Fi Aware - fun broadcastRoutedPacket(routed: RoutedPacket) { - broadcastPacket(routed) - } - - /** - * Send packet to connected peer. - */ - private fun sendPacketToPeer(peerID: String, packet: BitchatPacket) { - // Wi-Fi Aware uses full packets; no fragmentation - val data = packet.toBinaryData() ?: return - serviceScope.launch { - val sock = peerSockets[peerID] - if (sock == null) { - Log.w(TAG, "TX: no socket for ${peerID.take(8)}") - return@launch - } - try { - sock.getOutputStream().write(data) - Log.d(TAG, "TX: packet type=${packet.type} to ${peerID.take(8)} (bytes=${data.size})") - } catch (e: IOException) { - Log.e(TAG, "TX: write to ${peerID.take(8)} failed: ${e.message}") - } - } - } - - /** - * Configures delegates for internal components so that events are routed back - * through this service and ultimately to the {@link WifiAwareMeshDelegate}. - */ - private fun setupDelegates() { - peerManager.delegate = object : PeerManagerDelegate { - override fun onPeerListUpdated(peerIDs: List) { - delegate?.didUpdatePeerList(peerIDs) - } - override fun onPeerRemoved(peerID: String) { - try { gossipSyncManager.removeAnnouncementForPeer(peerID) } catch (_: Exception) { } - try { encryptionService.removePeer(peerID) } catch (_: Exception) { } - } - } - - securityManager.delegate = object : SecurityManagerDelegate { - override fun onKeyExchangeCompleted(peerID: String, peerPublicKeyData: ByteArray) { - serviceScope.launch { - delay(100) - sendAnnouncementToPeer(peerID) - delay(1000) - storeForwardManager.sendCachedMessages(peerID) - } - } - override fun sendHandshakeResponse(peerID: String, response: ByteArray) { - val packet = BitchatPacket( - version = 1u, - type = MessageType.NOISE_HANDSHAKE.value, - senderID = hexStringToByteArray(myPeerID), - recipientID = hexStringToByteArray(peerID), - timestamp = System.currentTimeMillis().toULong(), - payload = response, - ttl = MAX_TTL - ) - broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) - } - override fun getPeerInfo(peerID: String): PeerInfo? { - return peerManager.getPeerInfo(peerID) - } - } - - storeForwardManager.delegate = object : StoreForwardManagerDelegate { - override fun isFavorite(peerID: String) = delegate?.isFavorite(peerID) ?: false - override fun isPeerOnline(peerID: String) = peerManager.isPeerActive(peerID) - override fun sendPacket(packet: BitchatPacket) { - broadcastPacket(RoutedPacket(packet)) - } - } - - messageHandler.delegate = object : MessageHandlerDelegate { - override fun addOrUpdatePeer(peerID: String, nickname: String) = - peerManager.addOrUpdatePeer(peerID, nickname) - override fun removePeer(peerID: String) = peerManager.removePeer(peerID) - override fun updatePeerNickname(peerID: String, nickname: String) { - peerManager.addOrUpdatePeer(peerID, nickname) - } - override fun getPeerNickname(peerID: String) = - peerManager.getPeerNickname(peerID) - override fun getNetworkSize() = peerManager.getActivePeerCount() - override fun getMyNickname() = delegate?.getNickname() - override fun getPeerInfo(peerID: String): PeerInfo? = peerManager.getPeerInfo(peerID) - override fun updatePeerInfo( - peerID: String, - nickname: String, - noisePublicKey: ByteArray, - signingPublicKey: ByteArray, - isVerified: Boolean - ): Boolean = peerManager.updatePeerInfo(peerID, nickname, noisePublicKey, signingPublicKey, isVerified) - - override fun sendPacket(packet: BitchatPacket) { - broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) - } - override fun relayPacket(routed: RoutedPacket) { broadcastPacket(routed) } - override fun getBroadcastRecipient() = SpecialRecipients.BROADCAST - - override fun verifySignature(packet: BitchatPacket, peerID: String) = - securityManager.verifySignature(packet, peerID) - override fun encryptForPeer(data: ByteArray, recipientPeerID: String) = - securityManager.encryptForPeer(data, recipientPeerID) - override fun decryptFromPeer(encryptedData: ByteArray, senderPeerID: String) = - securityManager.decryptFromPeer(encryptedData, senderPeerID) - override fun verifyEd25519Signature(signature: ByteArray, data: ByteArray, publicKey: ByteArray): Boolean = - encryptionService.verifyEd25519Signature(signature, data, publicKey) - - override fun hasNoiseSession(peerID: String) = - encryptionService.hasEstablishedSession(peerID) - override fun initiateNoiseHandshake(peerID: String) { - serviceScope.launch { - val hs = encryptionService.initiateHandshake(peerID) ?: return@launch - val packet = BitchatPacket( - version = 1u, - type = MessageType.NOISE_HANDSHAKE.value, - senderID = hexStringToByteArray(myPeerID), - recipientID = hexStringToByteArray(peerID), - timestamp = System.currentTimeMillis().toULong(), - payload = hs, - ttl = MAX_TTL - ) - broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) - } - } - override fun processNoiseHandshakeMessage(payload: ByteArray, peerID: String): ByteArray? = - try { encryptionService.processHandshakeMessage(payload, peerID) } catch (_: Exception) { null } - - override fun updatePeerIDBinding(newPeerID: String, nickname: String, publicKey: ByteArray, previousPeerID: String?) { - peerManager.addOrUpdatePeer(newPeerID, nickname) - val fingerprint = peerManager.storeFingerprintForPeer(newPeerID, publicKey) - previousPeerID?.let { peerManager.removePeer(it) } - Log.d(TAG, "Updated peer binding to $newPeerID, fp=${fingerprint.take(16)}") - } - - override fun decryptChannelMessage(encryptedContent: ByteArray, channel: String) = - delegate?.decryptChannelMessage(encryptedContent, channel) - - override fun onMessageReceived(message: BitchatMessage) { - delegate?.didReceiveMessage(message) - } - override fun onChannelLeave(channel: String, fromPeer: String) { - delegate?.didReceiveChannelLeave(channel, fromPeer) - } - override fun onDeliveryAckReceived(messageID: String, peerID: String) { - delegate?.didReceiveDeliveryAck(messageID, peerID) - } - override fun onReadReceiptReceived(messageID: String, peerID: String) { - delegate?.didReceiveReadReceipt(messageID, peerID) - } - } - - packetProcessor.delegate = object : PacketProcessorDelegate { - override fun validatePacketSecurity(packet: BitchatPacket, peerID: String) = - securityManager.validatePacket(packet, peerID) - override fun updatePeerLastSeen(peerID: String) = peerManager.updatePeerLastSeen(peerID) - override fun getPeerNickname(peerID: String): String? = peerManager.getPeerNickname(peerID) - override fun getNetworkSize(): Int = peerManager.getActivePeerCount() - override fun getBroadcastRecipient(): ByteArray = SpecialRecipients.BROADCAST - - override fun handleNoiseHandshake(routed: RoutedPacket): Boolean = - runBlocking { securityManager.handleNoiseHandshake(routed) } - - override fun handleNoiseEncrypted(routed: RoutedPacket) { - serviceScope.launch { messageHandler.handleNoiseEncrypted(routed) } - } - - override fun handleAnnounce(routed: RoutedPacket) { - serviceScope.launch { - val isFirst = messageHandler.handleAnnounce(routed) - routed.peerID?.let { pid -> - try { gossipSyncManager.scheduleInitialSyncToPeer(pid, 1_000) } catch (_: Exception) { } - } - try { gossipSyncManager.onPublicPacketSeen(routed.packet) } catch (_: Exception) { } - } - } - - override fun handleMessage(routed: RoutedPacket) { - serviceScope.launch { messageHandler.handleMessage(routed) } - try { - val pkt = routed.packet - val isBroadcast = (pkt.recipientID == null || pkt.recipientID.contentEquals(SpecialRecipients.BROADCAST)) - if (isBroadcast && pkt.type == MessageType.MESSAGE.value) { - gossipSyncManager.onPublicPacketSeen(pkt) - } - } catch (_: Exception) { } - } - - override fun handleLeave(routed: RoutedPacket) { - serviceScope.launch { messageHandler.handleLeave(routed) } - } - - override fun handleFragment(packet: BitchatPacket): BitchatPacket? { - try { - val isBroadcast = (packet.recipientID == null || packet.recipientID.contentEquals(SpecialRecipients.BROADCAST)) - if (isBroadcast && packet.type == MessageType.FRAGMENT.value) { - gossipSyncManager.onPublicPacketSeen(packet) - } - } catch (_: Exception) { } - return fragmentManager.handleFragment(packet) - } - - override fun sendAnnouncementToPeer(peerID: String) = this@WifiAwareMeshService.sendAnnouncementToPeer(peerID) - override fun sendCachedMessages(peerID: String) = storeForwardManager.sendCachedMessages(peerID) - override fun relayPacket(routed: RoutedPacket) = broadcastPacket(routed) - - override fun handleRequestSync(routed: RoutedPacket) { - val fromPeer = routed.peerID ?: return - val req = RequestSyncPacket.decode(routed.packet.payload) ?: return - gossipSyncManager.handleRequestSync(fromPeer, req) - } - } - } - - /** - * Starts Wi-Fi Aware services (publish + subscribe). - * - * Requires Wi-Fi state and location permissions. This method attaches to the - * Aware session and initializes both the publisher (server role) and subscriber - * (client role). - */ - @SuppressLint("MissingPermission") - @RequiresPermission(allOf = [ - Manifest.permission.ACCESS_WIFI_STATE, - Manifest.permission.CHANGE_WIFI_STATE - ]) - fun startServices() { - if (isActive) return - isActive = true - Log.i(TAG, "Starting Wi-Fi Aware mesh with peer ID: $myPeerID") - - awareManager?.attach(object : AttachCallback() { - @SuppressLint("MissingPermission") - @RequiresPermission(allOf = [ - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.NEARBY_WIFI_DEVICES - ]) - override fun onAttached(session: WifiAwareSession) { - wifiAwareSession = session - Log.i(TAG, "Wi-Fi Aware attached; starting publish & subscribe (peerID=$myPeerID)") - - // PUBLISH (server role) - session.publish( - PublishConfig.Builder() - .setServiceName(SERVICE_NAME) - .setServiceSpecificInfo(myPeerID.toByteArray()) - .build(), - object : DiscoverySessionCallback() { - override fun onPublishStarted(pub: PublishDiscoverySession) { - publishSession = pub - Log.d(TAG, "PUBLISH: onPublishStarted()") - } - override fun onServiceDiscovered( - peerHandle: PeerHandle, - serviceSpecificInfo: ByteArray, - matchFilter: List - ) { - val peerId = try { String(serviceSpecificInfo) } catch (_: Exception) { "" } - handleToPeerId[peerHandle] = peerId - if (peerId.isNotBlank()) discoveredTimestamps[peerId] = System.currentTimeMillis() - Log.d(TAG, "PUBLISH: onServiceDiscovered ssi='${peerId.take(16)}' len=${serviceSpecificInfo.size}") - } - - @RequiresApi(Build.VERSION_CODES.Q) - override fun onMessageReceived( - peerHandle: PeerHandle, - message: ByteArray - ) { - if (message.isEmpty()) return - val subscriberId = try { String(message) } catch (_: Exception) { "" } - if (subscriberId == myPeerID) return - - handleToPeerId[peerHandle] = subscriberId - if (subscriberId.isNotBlank()) discoveredTimestamps[subscriberId] = System.currentTimeMillis() - Log.d(TAG, "PUBLISH: got ping from $subscriberId; spinning up server") - handleSubscriberPing(publishSession!!, peerHandle) - } - }, - Handler(Looper.getMainLooper()) - ) - - // SUBSCRIBE (client role) - session.subscribe( - SubscribeConfig.Builder() - .setServiceName(SERVICE_NAME) - .build(), - object : DiscoverySessionCallback() { - override fun onSubscribeStarted(sub: SubscribeDiscoverySession) { - subscribeSession = sub - Log.d(TAG, "SUBSCRIBE: onSubscribeStarted()") - } - override fun onServiceDiscovered( - peerHandle: PeerHandle, - serviceSpecificInfo: ByteArray, - matchFilter: List - ) { - val peerId = try { String(serviceSpecificInfo) } catch (_: Exception) { "" } - handleToPeerId[peerHandle] = peerId - val msgId = (System.nanoTime() and 0x7fffffff).toInt() - subscribeSession?.sendMessage(peerHandle, msgId, myPeerID.toByteArray()) - if (peerId.isNotBlank()) discoveredTimestamps[peerId] = System.currentTimeMillis() - Log.d(TAG, "SUBSCRIBE: sent ping to '${peerId.take(16)}' (msgId=$msgId)") - } - - @RequiresApi(Build.VERSION_CODES.Q) - override fun onMessageReceived( - peerHandle: PeerHandle, - message: ByteArray - ) { - if (message.isEmpty()) return - val peerId = handleToPeerId[peerHandle] ?: return - if (peerId == myPeerID) return - - Log.d(TAG, "SUBSCRIBE: onMessageReceived() → server-ready from ${peerId.take(8)} payload=${message.size}B") - handleServerReady(peerHandle, message) - } - }, - Handler(Looper.getMainLooper()) - ) - } - override fun onAttachFailed() { - Log.e(TAG, "Wi-Fi Aware attach failed") - } - }, Handler(Looper.getMainLooper())) - - sendPeriodicBroadcastAnnounce() - gossipSyncManager.start() - } - - /** - * Stops the Wi-Fi Aware mesh services and cleans up sockets and sessions. - */ - fun stopServices() { - if (!isActive) return - isActive = false - Log.i(TAG, "Stopping Wi-Fi Aware mesh") - - sendLeaveAnnouncement() - - serviceScope.launch { - delay(200) - - gossipSyncManager.stop() - - networkCallbacks.values.forEach { runCatching { cm.unregisterNetworkCallback(it) } } - networkCallbacks.clear() - publishSession?.close(); publishSession = null - subscribeSession?.close(); subscribeSession = null - wifiAwareSession?.close(); wifiAwareSession = null - - serverSockets.values.forEach { it.closeQuietly() } - peerSockets.values.forEach { it.closeQuietly() } - handleToPeerId.clear() - serverSockets.clear() - peerSockets.clear() - - peerManager.shutdown() - fragmentManager.shutdown() - securityManager.shutdown() - storeForwardManager.shutdown() - messageHandler.shutdown() - packetProcessor.shutdown() - - serviceScope.cancel() - } - } - - /** - * Periodically broadcasts an ANNOUNCE packet (every ~30s) while the service is active, - * so new/idle peers can discover us without user action. - */ - private fun sendPeriodicBroadcastAnnounce() { - serviceScope.launch { - while (isActive) { - try { delay(30_000); sendBroadcastAnnounce() } catch (_: Exception) { } - } - } - } - - /** - * Handles subscriber ping: spawns a server socket and responds with connection info. - * - * @param pubSession The current publish discovery session - * @param peerHandle The handle for the peer that pinged us - */ - @RequiresApi(Build.VERSION_CODES.Q) - private fun handleSubscriberPing( - pubSession: PublishDiscoverySession, - peerHandle: PeerHandle - ) { - val peerId = handleToPeerId[peerHandle] ?: return - if (!amIServerFor(peerId)) return - - if (serverSockets.containsKey(peerId)) { - Log.v(TAG, "↪ already serving $peerId, skipping") - return - } - - val ss = ServerSocket(0) - serverSockets[peerId] = ss - val port = ss.localPort - - // Ensure port is set to reuse if connection was recently closed (TIME_WAIT) - try { - ss.reuseAddress = true - } catch (_: Exception) {} - - Log.d(TAG, "SERVER: listening for ${peerId.take(8)} on port $port") - - val spec = WifiAwareNetworkSpecifier.Builder(pubSession, peerHandle) - .setPskPassphrase(PSK) - .setPort(port) - .build() - // Default capabilities include NET_CAPABILITY_NOT_VPN. - // Keeping defaults for hardware interface handle acquisition compatibility with global VPNs. - val req = NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_WIFI_AWARE) - .setNetworkSpecifier(spec) - .build() - - val cb = object : ConnectivityManager.NetworkCallback() { - override fun onAvailable(network: Network) { - try { - val client = ss.accept() - try { network.bindSocket(client) } catch (e: Exception) { Log.w(TAG, "Server bindSocket EPERM: ${e.message}") } - client.keepAlive = true - Log.d(TAG, "SERVER: accepted TCP from ${peerId.take(8)} addr=${client.inetAddress?.hostAddress}") - peerSockets[peerId] = client - try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {} - try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {} - listenerExec.execute { listenToPeer(client, peerId) } - handleSubscriberKeepAlive(client, peerId, pubSession, peerHandle) - // Kick off Noise handshake for this logical peer - if (myPeerID < peerId) { - messageHandler.delegate?.initiateNoiseHandshake(peerId) - Log.d(TAG, "SERVER: initiating Noise handshake to ${peerId.take(8)} (lower ID)") - } - // Ensure fast presence even before handshake settles - serviceScope.launch { delay(150); sendBroadcastAnnounce() } - } catch (ioe: IOException) { - Log.e(TAG, "SERVER: accept failed for ${peerId.take(8)}", ioe) - } - } - override fun onLost(network: Network) { - networkCallbacks.remove(peerId) - Log.d(TAG, "SERVER: network lost for ${peerId.take(8)}") - } - } - - networkCallbacks[peerId] = cb - Log.d(TAG, "SERVER: requesting Aware network for ${peerId.take(8)}") - cm.requestNetwork(req, cb) - - val readyId = (System.nanoTime() and 0x7fffffff).toInt() - val portBytes = ByteBuffer.allocate(4) - .order(ByteOrder.BIG_ENDIAN) - .putInt(port) - .array() - Handler(Looper.getMainLooper()).post { - try { - val sent = pubSession.sendMessage(peerHandle, readyId, portBytes) - Log.d(TAG, "PUBLISH: server-ready sent=$sent (msgId=$readyId, port=$port)") - } catch (e: Exception) { - Log.e(TAG, "PUBLISH: Exception sending server-ready to $peerHandle", e) - } - } - } - - /** - * Sends periodic TCP and discovery keep-alive messages to maintain a subscriber connection. - * - * @param client Connected client socket - * @param peerId ID of the connected peer - */ - private fun handleSubscriberKeepAlive( - client: Socket, - peerId: String, - pubSession: PublishDiscoverySession, - peerHandle: PeerHandle - ) { - // TCP keep-alive pings - serviceScope.launch { - try { - val os = client.getOutputStream() - while (peerSockets.containsKey(peerId)) { - try { os.write(0) } catch (_: IOException) { break } - delay(2_000) - } - } catch (_: Exception) {} - } - // Discovery keep-alive - serviceScope.launch { - var msgId = 0 - while (peerSockets.containsKey(peerId)) { - try { pubSession.sendMessage(peerHandle, msgId++, ByteArray(0)) } catch (_: Exception) { break } - delay(20_000) - } - } - } - - /** - * Handles a "server ready" message from a publishing peer and initiates a client connection. - */ - @RequiresApi(Build.VERSION_CODES.Q) - private fun handleServerReady( - peerHandle: PeerHandle, - payload: ByteArray - ) { - if (payload.size < Int.SIZE_BYTES) { - Log.w(TAG, "handleServerReady called with invalid payload size=${payload.size}, dropping") - return - } - - val peerId = handleToPeerId[peerHandle] ?: return - if (amIServerFor(peerId)) return - if (peerSockets.containsKey(peerId)) { - Log.v(TAG, "↪ already client-connected to $peerId, skipping") - return - } - - val port = ByteBuffer.wrap(payload).order(ByteOrder.BIG_ENDIAN).int - Log.d(TAG, "CLIENT: connecting to ${peerId.take(8)} port=$port") - - val spec = WifiAwareNetworkSpecifier.Builder(subscribeSession!!, peerHandle) - .setPskPassphrase(PSK) - .build() - val req = NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_WIFI_AWARE) - .setNetworkSpecifier(spec) - .build() - - val cb = object : ConnectivityManager.NetworkCallback() { - override fun onAvailable(network: Network) { - // Do not bind process for Aware; use per-socket binding instead - } - override fun onCapabilitiesChanged(network: Network, nc: NetworkCapabilities) { - if (peerSockets.containsKey(peerId)) return - val info = (nc.transportInfo as? WifiAwareNetworkInfo) ?: return - val addr = info.peerIpv6Addr as? Inet6Address ?: return - - val lp = cm.getLinkProperties(network) - val iface = lp?.interfaceName - - try { - val sock = Socket() - try { network.bindSocket(sock) } catch (e: Exception) { Log.w(TAG, "Client bindSocket EPERM: ${e.message}") } - sock.tcpNoDelay = true - sock.keepAlive = true - - // Use scoped IPv6 if interface name is available - val scopedAddr = if (iface != null && addr.scopeId == 0) { - try { - Inet6Address.getByAddress(null, addr.address, java.net.NetworkInterface.getByName(iface)) - } catch (e: Exception) { - addr - } - } else { - addr - } - - sock.connect(java.net.InetSocketAddress(scopedAddr, port), 7000) - Log.d(TAG, "CLIENT: TCP connected to ${peerId.take(8)} addr=$scopedAddr:$port (iface=$iface)") - - peerSockets[peerId] = sock - try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {} - try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {} - listenerExec.execute { listenToPeer(sock, peerId) } - handleServerKeepAlive(sock, peerId, peerHandle) - // Kick off Noise handshake for this logical peer - if (myPeerID < peerId) { - messageHandler.delegate?.initiateNoiseHandshake(peerId) - Log.d(TAG, "CLIENT: initiating Noise handshake to ${peerId.take(8)} (lower ID)") - } - // Ensure fast presence even before handshake settles - serviceScope.launch { delay(150); sendBroadcastAnnounce() } - } catch (ioe: IOException) { - Log.e(TAG, "CLIENT: socket connect failed to ${peerId.take(8)}", ioe) - } - } - override fun onLost(network: Network) { - networkCallbacks.remove(peerId) - Log.d(TAG, "CLIENT: network lost for ${peerId.take(8)}") - } - } - - networkCallbacks[peerId] = cb - Log.d(TAG, "CLIENT: requesting Aware network for ${peerId.take(8)}") - cm.requestNetwork(req, cb) - } - - /** - * Sends periodic TCP and discovery keep-alive messages for server connections. - */ - private fun handleServerKeepAlive( - sock: Socket, - peerId: String, - peerHandle: PeerHandle - ) { - // TCP keep-alive - serviceScope.launch { - try { - val os = sock.getOutputStream() - while (peerSockets.containsKey(peerId)) { - try { os.write(0) } catch (_: IOException) { break } - delay(2_000) - } - } catch (_: Exception) {} - } - // Discovery keep-alive - serviceScope.launch { - var msgId = 0 - while (peerSockets.containsKey(peerId)) { - try { subscribeSession?.sendMessage(peerHandle, msgId++, ByteArray(0)) } catch (_: Exception) { break } - delay(20_000) - } - } - } - - /** - * Determines whether this device should act as the server in a given peer relationship. - */ - private fun amIServerFor(peerId: String) = myPeerID < peerId - - /** - * Listens for incoming packets from a connected peer and dispatches them through - * the packet processor. - * - * @param socket Socket connected to the peer - * @param initialLogicalPeerId Temporary identifier before peer ID resolution - */ - private fun listenToPeer(socket: Socket, initialLogicalPeerId: String) { - val inStream = socket.getInputStream() - val buf = ByteArray(64 * 1024) - var routedPeerId: String? = null - - while (isActive) { - val len = try { inStream.read(buf) } catch (_: IOException) { break } - if (len <= 0) break - - val raw = buf.copyOf(len) - val pkt = BitchatPacket.fromBinaryData(raw) ?: continue - - val senderPeerHex = pkt.senderID?.toHexString()?.take(16) ?: continue - if (senderPeerHex == myPeerID) continue - - val ts = pkt.timestamp - if (lastTimestamps.put(senderPeerHex, ts) == ts) { - continue - } - - if (routedPeerId == null) { - routedPeerId = senderPeerHex - peerSockets[routedPeerId] = socket - } - - Log.d(TAG, "RX: packet type=${pkt.type} from ${senderPeerHex.take(8)} (bytes=${raw.size})") - packetProcessor.processPacket(RoutedPacket(pkt, routedPeerId)) - } - - // Breaking out of the loop means the socket is dead or service is stopping. - // We MUST notify the mesh layer so it removes the logical peer immediately to allow reconnection. - Log.i(TAG, "Socket loop terminated for ${initialLogicalPeerId.take(8)} removing peer.") - handlePeerDisconnection(initialLogicalPeerId, routedPeerId) - socket.closeQuietly() - } - - private fun handlePeerDisconnection(initialId: String, routedId: String?) { - serviceScope.launch { - Log.d(TAG, "Cleaning up peer: $initialId / $routedId") - - peerSockets.remove(initialId)?.closeQuietly() - serverSockets.remove(initialId)?.closeQuietly() - networkCallbacks.remove(initialId)?.let { runCatching { cm.unregisterNetworkCallback(it) } } - peerManager.removePeer(initialId) - - routedId?.let { id -> - if (id != initialId) { - peerSockets.remove(id)?.closeQuietly() - serverSockets.remove(id)?.closeQuietly() - networkCallbacks.remove(id)?.let { runCatching { cm.unregisterNetworkCallback(it) } } - peerManager.removePeer(id) - } - } - } - } - - /** - * Sends a broadcast message to all peers. - * @param content Text content of the message - * @param mentions Optional list of mentioned peer IDs - * @param channel Optional channel name - */ - fun sendMessage(content: String, mentions: List = emptyList(), channel: String? = null) { - if (content.isEmpty()) return - - serviceScope.launch { - val packet = BitchatPacket( - version = 1u, - type = MessageType.MESSAGE.value, - senderID = hexStringToByteArray(myPeerID), - recipientID = SpecialRecipients.BROADCAST, - timestamp = System.currentTimeMillis().toULong(), - payload = content.toByteArray(Charsets.UTF_8), - signature = null, - ttl = MAX_TTL - ) - val signed = signPacketBeforeBroadcast(packet) - broadcastPacket(RoutedPacket(signed)) - try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } - } - } - - /** - * Sends a private encrypted message to a specific peer. - * - * @param content The message text - * @param recipientPeerID Destination peer ID - * @param recipientNickname Recipient nickname - * @param messageID Optional message ID (UUID if null) - */ - fun sendPrivateMessage(content: String, recipientPeerID: String, recipientNickname: String, messageID: String? = null) { - if (content.isEmpty() || recipientPeerID.isEmpty()) return - - serviceScope.launch { - val finalId = messageID ?: UUID.randomUUID().toString() - - if (encryptionService.hasEstablishedSession(recipientPeerID)) { - try { - val pm = PrivateMessagePacket(messageID = finalId, content = content) - val tlv = pm.encode() ?: return@launch - val payload = NoisePayload(type = NoisePayloadType.PRIVATE_MESSAGE, data = tlv).encode() - val enc = encryptionService.encrypt(payload, recipientPeerID) - - val pkt = BitchatPacket( - version = 1u, - type = MessageType.NOISE_ENCRYPTED.value, - senderID = hexStringToByteArray(myPeerID), - recipientID = hexStringToByteArray(recipientPeerID), - timestamp = System.currentTimeMillis().toULong(), - payload = enc, - signature = null, - ttl = MAX_TTL - ) - broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(pkt))) - } catch (e: Exception) { - Log.e(TAG, "Failed to encrypt private message: ${e.message}") - } - } else { - messageHandler.delegate?.initiateNoiseHandshake(recipientPeerID) - } - } - } - - /** - * Sends a read receipt for a specific message to the given peer over an established - * Noise session. If no session exists, this will log an error. - * - * @param messageID The ID of the message that was read. - * @param recipientPeerID The peer to notify. - * @param readerNickname Nickname of the reader (may be shown by the receiver). - */ - fun sendReadReceipt(messageID: String, recipientPeerID: String, readerNickname: String) { - serviceScope.launch { - try { - val payload = NoisePayload( - type = NoisePayloadType.READ_RECEIPT, - data = messageID.toByteArray(Charsets.UTF_8) - ).encode() - val enc = encryptionService.encrypt(payload, recipientPeerID) - val pkt = BitchatPacket( - version = 1u, - type = MessageType.NOISE_ENCRYPTED.value, - senderID = hexStringToByteArray(myPeerID), - recipientID = hexStringToByteArray(recipientPeerID), - timestamp = System.currentTimeMillis().toULong(), - payload = enc, - signature = null, - ttl = MAX_TTL - ) - broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(pkt))) - } catch (e: Exception) { - Log.e(TAG, "Failed to send read receipt: ${e.message}") - } - } - } - - /** - * Broadcasts a file (TLV payload) to all peers. Uses protocol version 2 to support - * large payloads and generates a deterministic transferId (sha256 of payload) for UI/state. - * - * @param file Encoded metadata and chunks descriptor of the file to send. - */ - fun sendFileBroadcast(file: BitchatFilePacket) { - try { - val payload = file.encode() ?: run { Log.e(TAG, "file TLV encode failed"); return } - serviceScope.launch { - val pkt = BitchatPacket( - version = 2u, // FILE_TRANSFER big length - type = MessageType.FILE_TRANSFER.value, - senderID = hexStringToByteArray(myPeerID), - recipientID = SpecialRecipients.BROADCAST, - timestamp = System.currentTimeMillis().toULong(), - payload = payload, - signature = null, - ttl = MAX_TTL - ) - val signed = signPacketBeforeBroadcast(pkt) - val transferId = sha256Hex(payload) - broadcastPacket(RoutedPacket(signed, transferId = transferId)) - try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } - } - } catch (e: Exception) { - Log.e(TAG, "sendFileBroadcast failed: ${e.message}", e) - } - } - - /** - * Sends a file privately to a specific peer. If no Noise session is established, - * a handshake will be initiated and the send is deferred/aborted for now. - * - * @param recipientPeerID Target peer. - * @param file Encoded metadata and chunks descriptor of the file to send. - */ - fun sendFilePrivate(recipientPeerID: String, file: BitchatFilePacket) { - try { - serviceScope.launch { - if (!encryptionService.hasEstablishedSession(recipientPeerID)) { - messageHandler.delegate?.initiateNoiseHandshake(recipientPeerID) - return@launch - } - val tlv = file.encode() ?: return@launch - val np = NoisePayload(type = NoisePayloadType.FILE_TRANSFER, data = tlv).encode() - val enc = encryptionService.encrypt(np, recipientPeerID) - val pkt = BitchatPacket( - version = 1u, - type = MessageType.NOISE_ENCRYPTED.value, - senderID = hexStringToByteArray(myPeerID), - recipientID = hexStringToByteArray(recipientPeerID), - timestamp = System.currentTimeMillis().toULong(), - payload = enc, - signature = null, - ttl = MAX_TTL - ) - val signed = signPacketBeforeBroadcast(pkt) - val transferId = sha256Hex(tlv) - broadcastPacket(RoutedPacket(signed, transferId = transferId)) - } - } catch (e: Exception) { - Log.e(TAG, "sendFilePrivate failed: ${e.message}", e) - } - } - - /** - * Attempts to cancel an in-flight file transfer identified by its transferId. - * - * @param transferId Deterministic id (usually sha256 of the file TLV). - * @return true if a transfer with this id was found and cancellation was scheduled, false otherwise. - */ - fun cancelFileTransfer(transferId: String): Boolean { - return false - } - - /** - * Computes the SHA-256 of the given bytes and returns a lowercase hex string. - * Falls back to the byte-length in hex if MessageDigest is unavailable. - */ - private fun sha256Hex(bytes: ByteArray): String = try { - val md = java.security.MessageDigest.getInstance("SHA-256") - md.update(bytes); md.digest().joinToString("") { "%02x".format(it) } - } catch (_: Exception) { bytes.size.toString(16) } - - /** - * Broadcasts an ANNOUNCE packet to the entire mesh. - */ - fun sendBroadcastAnnounce() { - serviceScope.launch { - val nickname = delegate?.getNickname() ?: myPeerID - val staticKey = encryptionService.getStaticPublicKey() ?: run { - Log.e(TAG, "No static public key available for announcement"); return@launch - } - val signingKey = encryptionService.getSigningPublicKey() ?: run { - Log.e(TAG, "No signing public key available for announcement"); return@launch - } - - val tlvPayload = IdentityAnnouncement(nickname, staticKey, signingKey).encode() ?: return@launch - - val announcePacket = BitchatPacket( - type = MessageType.ANNOUNCE.value, - ttl = MAX_TTL, - senderID = myPeerID, - payload = tlvPayload - ) - val signed = signPacketBeforeBroadcast(announcePacket) - - broadcastPacket(RoutedPacket(signed)) - try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } - } - } - - /** - * Sends an ANNOUNCE packet to a specific peer. - */ - fun sendAnnouncementToPeer(peerID: String) { - if (peerManager.hasAnnouncedToPeer(peerID)) return - - val nickname = delegate?.getNickname() ?: myPeerID - val staticKey = encryptionService.getStaticPublicKey() ?: return - val signingKey = encryptionService.getSigningPublicKey() ?: return - - val tlvPayload = IdentityAnnouncement(nickname, staticKey, signingKey).encode() ?: return - - val packet = BitchatPacket( - type = MessageType.ANNOUNCE.value, - ttl = MAX_TTL, - senderID = myPeerID, - payload = tlvPayload - ) - val signed = signPacketBeforeBroadcast(packet) - - broadcastPacket(RoutedPacket(signed)) - peerManager.markPeerAsAnnouncedTo(peerID) - try { gossipSyncManager.onPublicPacketSeen(signed) } catch (_: Exception) { } - } - - /** - * Sends a LEAVE announcement to all peers before disconnecting. - */ - private fun sendLeaveAnnouncement() { - val nickname = delegate?.getNickname() ?: myPeerID - val packet = BitchatPacket( - type = MessageType.LEAVE.value, - ttl = MAX_TTL, - senderID = myPeerID, - payload = nickname.toByteArray() - ) - broadcastPacket(RoutedPacket(signPacketBeforeBroadcast(packet))) - } - - /** @return Mapping of peer IDs to nicknames. */ - fun getPeerNicknames(): Map = peerManager.getAllPeerNicknames() - - /** @return Mapping of peer IDs to RSSI values. */ - fun getPeerRSSI(): Map = peerManager.getAllPeerRSSI() - - /** - * @return true if a Noise session with the peer is fully established. - */ - fun hasEstablishedSession(peerID: String) = encryptionService.hasEstablishedSession(peerID) - - /** - * @return a human-readable Noise session state for the given peer (implementation-defined). - */ - fun getSessionState(peerID: String) = encryptionService.getSessionState(peerID) - - /** - * Triggers a Noise handshake with the given peer. Safe to call repeatedly; no-op if already handshaking/established. - */ - fun initiateNoiseHandshake(peerID: String) = messageHandler.delegate?.initiateNoiseHandshake(peerID) - - /** - * @return the stored public-key fingerprint (hex) for a peer, if known. - */ - fun getPeerFingerprint(peerID: String): String? = peerManager.getFingerprintForPeer(peerID) - - /** - * Retrieves the full profile for a peer, including keys and verification state, if available. - */ - fun getPeerInfo(peerID: String): PeerInfo? = peerManager.getPeerInfo(peerID) - - /** - * Updates local metadata for a peer and returns whether the change was applied. - * - * @param peerID Target peer id. - * @param nickname Display name. - * @param noisePublicKey Peer’s Noise static public key. - * @param signingPublicKey Peer’s Ed25519 signing public key. - * @param isVerified Whether this identity is verified by the user. - * @return true if the record was updated or created, false otherwise. - */ - fun updatePeerInfo( - peerID: String, - nickname: String, - noisePublicKey: ByteArray, - signingPublicKey: ByteArray, - isVerified: Boolean - ): Boolean = peerManager.updatePeerInfo(peerID, nickname, noisePublicKey, signingPublicKey, isVerified) - - /** - * @return the local device’s long-term identity fingerprint (hex). - */ - fun getIdentityFingerprint(): String = encryptionService.getIdentityFingerprint() - - /** - * @return true if the UI should show an “encrypted” indicator for this peer. - */ - fun shouldShowEncryptionIcon(peerID: String) = encryptionService.hasEstablishedSession(peerID) - - /** - * @return a snapshot list of peers with established Noise sessions. - */ - fun getEncryptedPeers(): List = emptyList() - - /** - * @return the current IPv4/IPv6 address of a connected peer, if any. - * Prefers the scoped IPv6 address format. - */ - fun getDeviceAddressForPeer(peerID: String): String? = - peerSockets[peerID]?.let { resolveScopedAddress(it) } - - /** - * Helper to resolve a scoped IPv6 address from a socket for UI display. - */ - private fun resolveScopedAddress(sock: Socket): String? { - val addr = sock.inetAddress as? Inet6Address ?: return sock.inetAddress?.hostAddress - if (addr.scopeId != 0 || addr.isLoopbackAddress) return addr.hostAddress - - // If address has no scope but we are on Aware (Link-Local fe80), attempt interface resolution - val iface = try { - val lp = cm.getLinkProperties(cm.activeNetwork) - lp?.interfaceName ?: "aware0" - } catch (_: Exception) { "aware0" } - - return "${addr.hostAddress}%$iface" - } - - /** - * @return a mapping of peerID → connected device IP address for all active sockets. - * Results are formatted as scoped addresses if applicable. - */ - fun getDeviceAddressToPeerMapping(): Map { - val map = mutableMapOf() - peerSockets.forEach { (pid, sock) -> - map[pid] = resolveScopedAddress(sock) ?: "unknown" - } - return map - } - - /** - * @return map of peer ID to nickname, bridged for UI warning fix. - */ - fun getPeerNicknamesMap(): Map = peerManager.getAllPeerNicknames() - - /** Returns recently discovered peer IDs via Aware discovery (may not be connected). */ - fun getDiscoveredPeerIds(): Set = - (handleToPeerId.values + discoveredTimestamps.keys).filter { it.isNotBlank() }.toSet() - - /** - * Utility for logs/UI: pretty-prints one peer-to-address mapping per line. - */ - fun printDeviceAddressesForPeers(): String = - getDeviceAddressToPeerMapping().entries.joinToString("\n") { "${it.key} -> ${it.value}" } - - /** - * @return A detailed string containing the debug status of all mesh components. - */ - fun getDebugStatus(): String = buildString { - appendLine("=== Wi-Fi Aware Mesh Debug Status ===") - appendLine("My Peer ID: $myPeerID") - appendLine("Peers: ${peerSockets.keys}") - appendLine(peerManager.getDebugInfo(getDeviceAddressToPeerMapping())) - appendLine(fragmentManager.getDebugInfo()) - appendLine(securityManager.getDebugInfo()) - appendLine(storeForwardManager.getDebugInfo()) - appendLine(messageHandler.getDebugInfo()) - appendLine(packetProcessor.getDebugInfo()) - } - - /** Utility extension to safely close sockets. */ - private fun Socket.closeQuietly() = try { close() } catch (_: Exception) {} - - /** Utility extension to safely close server sockets. */ - private fun ServerSocket.closeQuietly() = try { close() } catch (_: Exception) {} -} - - -/** - * Delegate interface for mesh service callbacks (maintains exact same interface) - */ -interface WifiAwareMeshDelegate { - fun didReceiveMessage(message: BitchatMessage) - fun didUpdatePeerList(peers: List) - fun didReceiveChannelLeave(channel: String, fromPeer: String) - fun didReceiveDeliveryAck(messageID: String, recipientPeerID: String) - fun didReceiveReadReceipt(messageID: String, recipientPeerID: String) - fun decryptChannelMessage(encryptedContent: ByteArray, channel: String): String? - fun getNickname(): String? - fun isFavorite(peerID: String): Boolean - // registerPeerPublicKey REMOVED - fingerprints now handled centrally in PeerManager -} From 1b9f76be2307e040f0278182062ac56177babf31 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Sun, 4 Jan 2026 02:35:06 +0700 Subject: [PATCH 08/10] Fix notification user try 2 (#541) * count peers in notification * cleanup --- .../java/com/bitchat/android/service/MeshForegroundService.kt | 4 ++-- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-bn/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fa/strings.xml | 1 + app/src/main/res/values-fil/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-he/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ka/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-mg/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-ne/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pa-rPK/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-ta/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-ur/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 35 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt b/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt index e92274f8..998c03b2 100644 --- a/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt +++ b/app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt @@ -276,7 +276,7 @@ class MeshForegroundService : Service() { } else true } - private fun buildNotification(activeUsers: Int): Notification { + private fun buildNotification(activePeers: Int): Notification { val openIntent = Intent(this, MainActivity::class.java) val pendingIntent = PendingIntent.getActivity( this, 0, openIntent, @@ -291,7 +291,7 @@ class MeshForegroundService : Service() { ) val title = getString(R.string.app_name) - val content = getString(R.string.mesh_service_notification_content, activeUsers) + val content = getString(R.string.mesh_service_notification_content, activePeers) return NotificationCompat.Builder(this, CHANNEL_ID) .setContentTitle(title) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 94414ce5..3f6d7ddf 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -362,4 +362,5 @@ كن أول من يضيف ملاحظة لهذا المكان. إغلاق أضف ملاحظة لهذا المكان + الشبكة تعمل — %1$d أقران diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index a9f82658..9948b452 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -349,4 +349,5 @@ %d জন + মেশ চলছে — %1$d পিয়ার diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 786c9dcb..84eb0fd4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -363,4 +363,5 @@ sei der Erste, der hier eine Notiz hinterlässt. schließen füge eine Notiz zu diesem Ort hinzu + Mesh läuft — %1$d Peers diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index acf3cb92..b72bfdf3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -362,4 +362,5 @@ sé el primero en añadir una para este sitio. cerrar agrega una nota para este lugar + Mesh en ejecución — %1$d pares diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 2896a97d..4007cf1a 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -349,4 +349,5 @@ %d نفر + مش در حال اجرا — %1$d همتا diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index bb150d93..b89824d6 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -362,4 +362,5 @@ %d tao + Tumatakbo ang Mesh — %1$d na peer diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b1936bce..e0e7c7eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -376,4 +376,5 @@ soyez le premier à en ajouter pour cet endroit. fermer ajoutez une note pour cet endroit + Mesh actif — %1$d pairs diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index a15f87af..059924d4 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -14,5 +14,6 @@ היה הראשון להוסיף הערה למקום זה. סגור הוסף הערה למקום זה + רשת Mesh פועלת — %1$d עמיתים diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 20981383..780015b0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -362,4 +362,5 @@ इस स्थान के लिए पहला नोट जोड़ें। बंद करें इस स्थान के लिए एक नोट जोड़ें + मेश चल रहा है — %1$d पीयर्स diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 00f8e7cf..744a499c 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -362,4 +362,5 @@ jadilah yang pertama menambahkan catatan untuk tempat ini. tutup tambahkan catatan untuk tempat ini + Mesh berjalan — %1$d peer diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d086ba3e..185dfa3f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -396,4 +396,5 @@ sii il primo ad aggiungerne una per questo posto. chiudi aggiungi una nota per questo luogo + Mesh in esecuzione — %1$d peer diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index be41d3d4..7d8f530f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -362,4 +362,5 @@ この場所の最初のメモを追加しましょう。 閉じる この場所へのメモを追加 + メッシュ実行中 — %1$d ピア diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index dbf16225..7c999d96 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -349,4 +349,5 @@ %d ადამიანი + Mesh გაშვებულია — %1$d პირები diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3163fa0c..bf9b6d53 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -362,4 +362,5 @@ 이 장소에 첫 번째 노트를 추가해 보세요. 닫기 이 장소에 노트 추가 + 메시 실행 중 — %1$d 피어 diff --git a/app/src/main/res/values-mg/strings.xml b/app/src/main/res/values-mg/strings.xml index 8d359165..4bed7bc0 100644 --- a/app/src/main/res/values-mg/strings.xml +++ b/app/src/main/res/values-mg/strings.xml @@ -376,4 +376,5 @@ Olona %d + Mandeha ny Mesh — %1$d peers diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 21d90e30..5027aade 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1,5 +1,6 @@ + Mesh sedang berjalan — %1$d rakan diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 80deea92..bae76cf0 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -362,4 +362,5 @@ %d जना + मेश चलिरहेको छ — %1$d पियर्स diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8d4d3096..40fdf86b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -394,4 +394,5 @@ wees de eerste die een notitie voor deze plek toevoegt. sluiten voeg een notitie toe voor deze plek + Mesh actief — %1$d peers diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 2c3b7729..80ea2b84 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -349,4 +349,5 @@ %d بندے + میش چل رہا ہے — %1$d ساتھی diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 492b0af0..daa016d6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -14,5 +14,6 @@ bądź pierwszy, który doda notatkę dla tego miejsca. zamknij dodaj notatkę dla tego miejsca + Mesh działa — %1$d peerów diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7d1998be..d736dd39 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -362,4 +362,5 @@ seja o primeiro a adicionar uma para este local. fechar adicione uma nota para este local + Mesh rodando — %1$d pares diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 207810b4..8e87c6e6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -362,4 +362,5 @@ seja o primeiro a adicionar uma para este local. fechar adicione uma nota para este local + Mesh em execução — %1$d pares diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 85fd0ba4..c6c3bd37 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -352,4 +352,5 @@ станьте первым, кто добавит заметку для этого места. закрыть добавьте заметку для этого места + Mesh запущен — %1$d пиров diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 62d8ef18..d461be4c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -350,4 +350,5 @@ var först med att lägga till en anteckning för den här platsen. stäng lägg till en anteckning för den här platsen + Mesh körs — %1$d peers diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 76893af8..c9e8943c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -1,5 +1,6 @@ + மெஷ் இயங்குகிறது — %1$d பியர்ஸ் diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index c1cbedbf..9ae074c7 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -349,4 +349,5 @@ %d คน + Mesh กำลังทำงาน — %1$d เพื่อน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cb728f5c..291c9904 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -350,4 +350,5 @@ bu yer için ilk notu ekleyen siz olun. kapat bu yer için bir not ekleyin + Mesh çalışıyor — %1$d eş diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c644c198..16914c6a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,5 +1,6 @@ + Mesh працює — %1$d пірів diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index f6a5832c..b782115f 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -362,4 +362,5 @@ اس جگہ کے لیے پہلا نوٹ شامل کریں۔ بند کریں اس جگہ کے لیے ایک نوٹ شامل کریں + میش چل رہا ہے — %1$d ساتھی diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 7a7df41f..ec726fc9 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -349,4 +349,5 @@ %d người + Mesh đang chạy — %1$d ngang hàng diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6ab11776..b979b121 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -14,5 +14,6 @@ 成为第一个为此地点添加笔记的人。 关闭 为此地点添加一条笔记 + Mesh 运行中 — %1$d 个节点 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b119edfb..7be4525f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -14,5 +14,6 @@ 成為第一個為此地點新增筆記的人。 關閉 為此地點新增一則筆記 + Mesh 運行中 — %1$d 個節點 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 1ae11941..17f53bbd 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -375,4 +375,5 @@ 成为第一个为此地点添加笔记的人。 关闭 为此地点添加一条笔记 + Mesh 运行中 — %1$d 个节点 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a985c6c..d85513de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -64,7 +64,7 @@ Mesh Background Service Keeps the Bluetooth mesh running in the background - Mesh running — %1$d users connected + Mesh running — %1$d peers Add to favorites From 7c183b0c8d14de051cfacfac8bb4745d19895296 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 4 Jan 2026 06:08:02 +0000 Subject: [PATCH 09/10] Automated update of relay data - Sun Jan 4 06:08:02 UTC 2026 --- app/src/main/assets/nostr_relays.csv | 569 +++++++++++++-------------- 1 file changed, 282 insertions(+), 287 deletions(-) diff --git a/app/src/main/assets/nostr_relays.csv b/app/src/main/assets/nostr_relays.csv index ab075fb4..345b731b 100644 --- a/app/src/main/assets/nostr_relays.csv +++ b/app/src/main/assets/nostr_relays.csv @@ -1,295 +1,290 @@ Relay URL,Latitude,Longitude -strfry.shock.network,39.0438,-77.4874 -wot.nostr.party,36.1627,-86.7816 -nostr.blankfors.se,60.1699,24.9384 -nostr.now,36.55,139.733 -nostr.simplex.icu,51.5121,-0.0005238 -relay.threenine.services,51.5524,-0.29686 -relay.barine.co,43.6532,-79.3832 -theoutpost.life,64.1476,-21.9392 -purplerelay.com,50.1109,8.68213 -nostrue.com,40.8054,-74.0241 -relay-arg.zombi.cloudrodion.com,1.35208,103.82 -shu02.shugur.net,21.4902,39.2246 -relayone.geektank.ai,18.2148,-63.0574 -relay03.lnfi.network,39.0997,-94.5786 -soloco.nl,43.6532,-79.3832 -relay-testnet.k8s.layer3.news,37.3387,-121.885 -nostr.azzamo.net,52.2633,21.0283 -nostr.red5d.dev,43.6532,-79.3832 -nostr.thebiglake.org,32.71,-96.6745 -nostr.tadryanom.me,43.6532,-79.3832 -schnorr.me,43.6532,-79.3832 -ithurtswhenip.ee,51.223,6.78245 -orly.ft.hn,50.4754,12.3683 -relay02.lnfi.network,39.0997,-94.5786 -relay.nosto.re,51.1792,5.89444 -strfry.openhoofd.nl,51.9229,4.40833 -relays.diggoo.com,43.6532,-79.3832 -relay.nostrhub.tech,49.0291,8.35696 -relay.artx.market,43.652,-79.3633 -relay.sigit.io,50.4754,12.3683 -nostr-relay.psfoundation.info,39.0438,-77.4874 -wot.brightbolt.net,47.6735,-116.781 -relay.bitcoinartclock.com,50.4754,12.3683 -khatru.nostrver.se,51.1792,5.89444 -relay.cosmicbolt.net,37.3986,-121.964 -adre.su,59.9311,30.3609 -nostrelay.memory-art.xyz,43.6532,-79.3832 -temp.iris.to,43.6532,-79.3832 -nproxy.kristapsk.lv,60.1699,24.9384 -relay.ngengine.org,43.6532,-79.3832 -relay.puresignal.news,43.6532,-79.3832 -nostr.stakey.net,52.3676,4.90414 -nostr.commonshub.brussels,49.4543,11.0746 -wot.shaving.kiwi,43.6532,-79.3832 -espelho.girino.org,43.6532,-79.3832 -relay.thibautduchene.fr,43.6532,-79.3832 -nostr-relay.corb.net,38.8353,-104.822 -wot.soundhsa.com,33.1384,-95.6011 -relay.jabato.space,52.52,13.405 -relay.credenso.cafe,43.3601,-80.3127 -relayone.soundhsa.com,33.1384,-95.6011 -relay.bitcoinveneto.org,64.1466,-21.9426 -relay.samt.st,40.8302,-74.1299 -relay.vrtmrz.net,43.6532,-79.3832 -nostr.data.haus,50.4754,12.3683 -relay.npubhaus.com,43.6532,-79.3832 -strfry.elswa-dev.online,50.1109,8.68213 -relay.wavefunc.live,34.0362,-118.443 -wot.sovbit.host,64.1466,-21.9426 -relay.smies.me,33.7501,-84.3885 -nostr.bilthon.dev,25.8128,-80.2377 -relay-fra.zombi.cloudrodion.com,48.8566,2.35222 -santo.iguanatech.net,40.8302,-74.1299 -prl.plus,42.6978,23.3246 -relay-freeharmonypeople.space,38.7223,-9.13934 -nostream.breadslice.com,1.35208,103.82 -nostr.notribe.net,40.8302,-74.1299 -relay.fountain.fm,39.0997,-94.5786 -orangepiller.org,60.1699,24.9384 -nostr.21crypto.ch,47.5356,8.73209 -nostr.camalolo.com,24.1469,120.684 -okn.czas.top,51.267,6.81738 -relay.wolfcoil.com,35.6092,139.73 -nostr.quali.chat,60.1699,24.9384 -nostr-relay.online,43.6532,-79.3832 -alienos.libretechsystems.xyz,55.4724,9.87335 -ribo.eu.nostria.app,52.3676,4.90414 -wot.yesnostr.net,50.9871,2.12554 -nostr.overmind.lol,43.6532,-79.3832 -relay.chakany.systems,43.6532,-79.3832 -relay.hasenpfeffr.com,39.0438,-77.4874 -nostrelites.org,41.8781,-87.6298 -strfry.bonsai.com,37.8715,-122.273 -relay.agora.social,50.7383,15.0648 alien.macneilmediagroup.com,43.6532,-79.3832 -relay.getsafebox.app,43.6532,-79.3832 -relay.nuts.cash,34.0362,-118.443 -notemine.io,52.2026,20.9397 -relay.nostr.place,32.7767,-96.797 -relay.21e6.cz,50.7383,15.0648 -nostr.casa21.space,43.6532,-79.3832 -premium.primal.net,43.6532,-79.3832 -relay5.bitransfer.org,43.6532,-79.3832 -nostr.rblb.it,43.7094,10.6582 -relay.goodmorningbitcoin.com,43.6532,-79.3832 -relay.camelus.app,45.5201,-122.99 -relay.origin.land,35.6673,139.751 -relay.fr13nd5.com,52.5233,13.3426 -nos.lol,50.4754,12.3683 -wot.nostr.net,43.6532,-79.3832 -relay.javi.space,43.4633,11.8796 -relay2.ngengine.org,43.6532,-79.3832 -relay.angor.io,48.1046,11.6002 -pyramid.treegaze.com,43.6532,-79.3832 -relay.letsfo.com,52.2633,21.0283 -relay.nostrzh.org,43.6532,-79.3832 -nostr.hekster.org,37.3986,-121.964 -relay.0xchat.com,1.35208,103.82 -nostr.czas.top,50.1109,8.68213 -nostr.superfriends.online,43.6532,-79.3832 -hsuite-nostr-relay.hbarsuite.workers.dev,43.6532,-79.3832 -relay.mccormick.cx,52.3563,4.95714 -nostr.88mph.life,51.5072,-0.127586 -strfry.ymir.cloud,34.0965,-117.585 -nostr.lkjsxc.com,43.6532,-79.3832 -yabu.me,35.6092,139.73 -relay.chorus.community,50.1109,8.68213 -nostr-02.yakihonne.com,1.32123,103.695 -neuromancer.nettek.io,39.1429,-94.573 -relay04.lnfi.network,39.0997,-94.5786 -nostr-relay.amethyst.name,39.0438,-77.4874 -nostrcheck.tnsor.network,43.6532,-79.3832 -wot.nostr.place,32.7767,-96.797 -cyberspace.nostr1.com,40.7057,-74.0136 -relay.guggero.org,47.3769,8.54169 -nostr.calitabby.net,39.9268,-75.0246 -x.kojira.io,43.6532,-79.3832 -nostr.agentcampfire.com,52.3676,4.90414 -relay.bullishbounty.com,43.6532,-79.3832 -relay.nostrverse.net,43.6532,-79.3832 -nostr.robosats.org,64.1476,-21.9392 -nostr-verified.wellorder.net,45.5201,-122.99 -nostr.huszonegy.world,47.4979,19.0402 -relay.cypherflow.ai,48.8566,2.35222 -nostr-relay.xbytez.io,50.6924,3.20113 -nostr.faultables.net,43.6532,-79.3832 -relay.libernet.app,43.6532,-79.3832 -relay.magiccity.live,25.8128,-80.2377 -relay.wellorder.net,45.5201,-122.99 -black.nostrcity.club,48.8575,2.35138 -relay.jeffg.fyi,43.6532,-79.3832 -freeben666.fr,43.7221,7.15296 -relay.nostr.wirednet.jp,34.706,135.493 -nostrelay.circum.space,52.3676,4.90414 -relay.islandbitcoin.com,12.8498,77.6545 -nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 -relay.nostriot.com,41.5695,-83.9786 -relayrs.notoshi.win,43.6532,-79.3832 -nostr-pub.wellorder.net,45.5201,-122.99 -nostr.vulpem.com,49.4543,11.0746 -nostr.sathoarder.com,48.5734,7.75211 -wheat.happytavern.co,43.6532,-79.3832 -relay.nostr.net,43.6532,-79.3832 -bcast.girino.org,43.6532,-79.3832 -nostr-02.czas.top,51.2277,6.77346 -vault.iris.to,43.6532,-79.3832 -ynostr.yael.at,60.1699,24.9384 -nostr.nodesmap.com,59.3327,18.0656 -nostr.n7ekb.net,47.4941,-122.294 -relayb.uid.ovh,43.6532,-79.3832 -shu05.shugur.net,48.8566,2.35222 -dev-relay.lnfi.network,39.0997,-94.5786 -relay.bitcoindistrict.org,43.6532,-79.3832 -nostr.spicyz.io,43.6532,-79.3832 -nostr.0x7e.xyz,47.4988,8.72369 -relay.dwadziesciajeden.pl,52.2297,21.0122 -relay.zone667.com,60.1699,24.9384 -nostr-dev.wellorder.net,45.5201,-122.99 -nos.xmark.cc,50.6924,3.20113 -relay.etch.social,41.2619,-95.8608 -nostr.na.social,43.6532,-79.3832 -relay.orangepill.ovh,49.1689,-0.358841 -relay.olas.app,50.4754,12.3683 -relay.holzeis.me,43.6532,-79.3832 -relay2.angor.io,48.1046,11.6002 -relay.degmods.com,50.4754,12.3683 -vitor.nostr1.com,40.7128,-74.006 -relay.btcforplebs.com,43.6532,-79.3832 -nostr.luisschwab.net,43.6532,-79.3832 -relay.moinsen.com,50.4754,12.3683 -czas.xyz,48.8566,2.35222 -nostr.bitcoiner.social,39.1585,-94.5728 -nostr.mehdibekhtaoui.com,49.4939,-1.54813 -inbox.azzamo.net,52.2633,21.0283 -nostr.ovia.to,43.6532,-79.3832 -nostr.myshosholoza.co.za,52.3676,4.90414 -fenrir-s.notoshi.win,43.6532,-79.3832 -relay-rpi.edufeed.org,49.4521,11.0767 -chat-relay.zap-work.com,43.6532,-79.3832 -nostr.bond,50.1109,8.68213 -relay01.lnfi.network,39.0997,-94.5786 -relay.seq1.net,43.6532,-79.3832 -nostr.rikmeijer.nl,50.4754,12.3683 -offchain.pub,47.6743,-117.112 -nostr.spaceshell.xyz,43.6532,-79.3832 -nos4smartnkind.tech,40.1872,44.5152 -kotukonostr.onrender.com,37.7775,-122.397 -nostr.ps1829.com,33.8851,130.883 -relay.lightning.pub,39.0438,-77.4874 -nostr-relay.gateway.in.th,15.2634,100.344 -relay.thebluepulse.com,49.4521,11.0767 -relay.malxte.de,52.52,13.405 -relay.usefusion.ai,38.7134,-78.1591 -nostr-relay.cbrx.io,43.6532,-79.3832 -shu01.shugur.net,21.4902,39.2246 -nostr.jerrynya.fun,31.2304,121.474 -dev-nostr.bityacht.io,25.0797,121.234 -bitsat.molonlabe.holdings,51.4012,-1.3147 -relay.primal.net,43.6532,-79.3832 -relay.wavlake.com,41.2619,-95.8608 -nostr-relay.nextblockvending.com,47.2343,-119.853 v-relay.d02.vrtmrz.net,34.6937,135.502 -nostr.mikoshi.de,47.74,12.0917 -nostr.coincards.com,53.5501,-113.469 -relay.snort.social,53.3498,-6.26031 -bitcoiner.social,39.1585,-94.5728 -nostr.noones.com,50.1109,8.68213 -wot.dergigi.com,64.1476,-21.9392 +relay.thebluepulse.com,49.4521,11.0767 +relay.guggero.org,47.3769,8.54169 relay.lumina.rocks,49.0291,8.35695 -nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 -nostr.snowbla.de,60.1699,24.9384 -strfry.felixzieger.de,50.1013,8.62643 -relay.satlantis.io,32.8769,-80.0114 -relay-dev.satlantis.io,40.8302,-74.1299 -nostr.davidebtc.me,51.5072,-0.127586 -relay.mattybs.lol,43.6532,-79.3832 -relay.fundstr.me,42.3601,-71.0589 -relay.tagayasu.xyz,43.6715,-79.38 -nostr-relay.zimage.com,34.0549,-118.243 -nostrcheck.me,43.6532,-79.3832 -bucket.coracle.social,37.7775,-122.397 -relay.siamdev.cc,13.9178,100.424 -r.bitcoinhold.net,43.6532,-79.3832 -skeme.vanderwarker.family,40.8218,-74.45 -articles.layer3.news,37.3387,-121.885 -no.str.cr,9.92857,-84.0528 -srtrelay.c-stellar.net,43.6532,-79.3832 -relay.comcomponent.com,34.7062,135.493 -relay.illuminodes.com,47.6061,-122.333 -nostr.openhoofd.nl,51.9229,4.40833 -nostr.plantroon.com,50.1013,8.62643 -slick.mjex.me,39.048,-77.4817 -relay.minibolt.info,43.6532,-79.3832 -nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 -relay.nostrdice.com,-33.8688,151.209 -wot.dtonon.com,43.6532,-79.3832 -shu04.shugur.net,25.2604,55.2989 -nostr.tavux.tech,48.8575,2.35138 -nostr-02.uid.ovh,43.6532,-79.3832 -relay.nostrcheck.me,43.6532,-79.3832 -relay.nsnip.io,60.1699,24.9384 -relay.toastr.net,40.8054,-74.0241 -relay.divine.video,43.6532,-79.3832 -nostr.4rs.nl,49.0291,8.35696 -wot.sebastix.social,51.1792,5.89444 -relay.openfarmtools.org,60.1699,24.9384 -relay.damus.io,43.6532,-79.3832 -purpura.cloud,43.6532,-79.3832 -wot.sudocarlos.com,51.5072,-0.127586 -relay.arx-ccn.com,50.4754,12.3683 -nostr.zoracle.org,45.6018,-121.185 -nostr.tac.lol,47.4748,-122.273 -relay.coinos.io,43.6532,-79.3832 -nostr.rtvslawenia.com,49.4543,11.0746 -relay.davidebtc.me,51.5072,-0.127586 -ribo.us.nostria.app,41.5868,-93.625 -relay.upleb.uk,51.9194,19.1451 -librerelay.aaroniumii.com,43.6532,-79.3832 -relay.endfiat.money,43.6532,-79.3832 -relay.nostar.org,43.6532,-79.3832 -relay.electriclifestyle.com,26.2897,-80.1293 -relay.nostrhub.fr,48.1045,11.6004 -relay.agorist.space,52.3734,4.89406 -freelay.sovbit.host,64.1476,-21.9392 -nostr.hifish.org,47.4043,8.57398 -nostr-01.yakihonne.com,1.32123,103.695 -relay.routstr.com,43.6532,-79.3832 -nr.yay.so,46.2126,6.1154 -bcast.seutoba.com.br,43.6532,-79.3832 -fanfares.nostr1.com,40.7128,-74.006 -nostr.girino.org,43.6532,-79.3832 -nostr2.girino.org,43.6532,-79.3832 -relay.notoshi.win,13.311,101.112 -nostrja-kari.heguro.com,43.6532,-79.3832 -relay.mostro.network,40.8302,-74.1299 -satsage.xyz,37.3986,-121.964 +relay-freeharmonypeople.space,38.7223,-9.13934 +nostr-relay.online,43.6532,-79.3832 +shu05.shugur.net,48.8566,2.35222 relay.evanverma.com,40.8302,-74.1299 -nostr-2.21crypto.ch,47.5356,8.73209 +relay2.angor.io,48.1046,11.6002 +relay.arx-ccn.com,50.4754,12.3683 +relay.davidebtc.me,51.5072,-0.127586 +temp.iris.to,43.6532,-79.3832 +nostr.superfriends.online,43.6532,-79.3832 +vitor.nostr1.com,40.7057,-74.0136 +relay.moinsen.com,50.4754,12.3683 +ithurtswhenip.ee,51.223,6.78245 +nostr.tadryanom.me,43.6532,-79.3832 +relay.nostr.wirednet.jp,34.706,135.493 +relay.0xchat.com,1.35208,103.82 +nostrcheck.tnsor.network,43.6532,-79.3832 +relay.ngengine.org,43.6532,-79.3832 relay.mitchelltribe.com,39.0438,-77.4874 -relaynostr.breadslice.com,43.6532,-79.3832 -nostr.chaima.info,51.223,6.78245 -nostr.mom,50.4754,12.3683 +wotr.relatr.xyz,53.3498,-6.26031 +relay.chorus.community,50.1109,8.68213 +orly.ft.hn,50.4754,12.3683 +nostr.stakey.net,52.3676,4.90414 +relay.malxte.de,52.52,13.405 +nostrelay.circum.space,52.3676,4.90414 +nostrcheck.me,43.6532,-79.3832 +wot.sudocarlos.com,51.5072,-0.127586 +relay.routstr.com,43.6532,-79.3832 +relay.siamdev.cc,13.8434,100.363 +wot.sovbit.host,64.1466,-21.9426 +strfry.bonsai.com,37.8715,-122.273 +freeben666.fr,43.7221,7.15296 +okn.czas.top,51.267,6.81738 +relay.nostar.org,43.6532,-79.3832 +relay.jeffg.fyi,43.6532,-79.3832 +nostr-02.uid.ovh,43.6532,-79.3832 +relay.fr13nd5.com,52.5233,13.3426 +srtrelay.c-stellar.net,43.6532,-79.3832 +relay.dwadziesciajeden.pl,52.2297,21.0122 +relay.sigit.io,50.4754,12.3683 +nostr.girino.org,43.6532,-79.3832 +bitsat.molonlabe.holdings,51.4012,-1.3147 +nostream.breadslice.com,1.35208,103.82 +nostr.rtvslawenia.com,49.4543,11.0746 +nostr.openhoofd.nl,51.9229,4.40833 +librerelay.aaroniumii.com,43.6532,-79.3832 +relay.etch.social,41.2619,-95.8608 +strfry.felixzieger.de,50.1013,8.62643 +relay.wavlake.com,41.2619,-95.8608 +relay.fundstr.me,42.3601,-71.0589 +slick.mjex.me,39.048,-77.4817 +relay.upleb.uk,51.9194,19.1451 +nos4smartnkind.tech,40.1872,44.5152 +discovery.eu.nostria.app,52.3676,4.90414 +nostr.tac.lol,47.4748,-122.273 +wot.nostr.net,43.6532,-79.3832 +nostr-dev.wellorder.net,45.5201,-122.99 +fanfares.nostr1.com,40.7128,-74.006 +relay.bitcoindistrict.org,43.6532,-79.3832 +nostr-relay.nextblockvending.com,47.2343,-119.853 +relay-rpi.edufeed.org,49.4521,11.0767 +relay.nsnip.io,60.1699,24.9384 +black.nostrcity.club,48.8575,2.35138 +nostr-02.czas.top,51.2277,6.77346 +schnorr.me,43.6532,-79.3832 +relay.fountain.fm,39.0997,-94.5786 +nostr-verified.wellorder.net,45.5201,-122.99 +relay.divine.video,43.6532,-79.3832 +relay.thibautduchene.fr,43.6532,-79.3832 +nostr.plantroon.com,50.1013,8.62643 +relay.hasenpfeffr.com,39.0438,-77.4874 +relay.chakany.systems,43.6532,-79.3832 +nostr-01.yakihonne.com,1.32123,103.695 +nostr.azzamo.net,52.2633,21.0283 +nostr.bond,50.1109,8.68213 +nostr.coincards.com,53.5501,-113.469 +relay.nostrhub.tech,49.0291,8.35696 +relay.cosmicbolt.net,37.3986,-121.964 +nostr.21crypto.ch,47.5356,8.73209 +relay-dev.satlantis.io,40.8302,-74.1299 +offchain.pub,47.6743,-117.112 +relay.orangepill.ovh,49.1689,-0.358841 +nostr-relay.gateway.in.th,15.2634,100.344 +nostr.now,36.55,139.733 +relay.usefusion.ai,38.7134,-78.1591 +nostr.lkjsxc.com,43.6532,-79.3832 +nproxy.kristapsk.lv,60.1699,24.9384 +relay.nostrverse.net,43.6532,-79.3832 +relay.zone667.com,60.1699,24.9384 +relay.origin.land,35.6673,139.751 +relay.damus.io,43.6532,-79.3832 +relay.bnos.space,1.35208,103.82 +relay.endfiat.money,43.6532,-79.3832 +relay.bullishbounty.com,43.6532,-79.3832 +wot.nostr.party,36.1627,-86.7816 +nostr.huszonegy.world,47.4979,19.0402 +theoutpost.life,64.1476,-21.9392 +nostr.noones.com,50.1109,8.68213 +relay.21e6.cz,50.7383,15.0648 +nostr-relay.xbytez.io,50.6924,3.20113 +wot.shaving.kiwi,43.6532,-79.3832 +relay.trustroots.org,43.6532,-79.3832 +wot.dtonon.com,43.6532,-79.3832 +nostr.camalolo.com,24.1469,120.684 +czas.xyz,48.8566,2.35222 +relayrs.notoshi.win,43.6532,-79.3832 +skeme.vanderwarker.family,40.8218,-74.45 +nostr.red5d.dev,43.6532,-79.3832 +relay.javi.space,43.4633,11.8796 +relay.nuts.cash,34.0362,-118.443 +nostr.commonshub.brussels,49.4543,11.0746 +relay.artx.market,43.652,-79.3633 +satsage.xyz,37.3986,-121.964 +relay.nostx.io,43.6532,-79.3832 +shu02.shugur.net,21.4902,39.2246 +strfry.ymir.cloud,34.0965,-117.585 relay.nostr-check.me,43.6532,-79.3832 +relay04.lnfi.network,39.0997,-94.5786 +kotukonostr.onrender.com,37.7775,-122.397 +nostr.davidebtc.me,51.5072,-0.127586 +relay2.ngengine.org,43.6532,-79.3832 +ribo.us.nostria.app,41.5868,-93.625 +nostr.czas.top,50.1109,8.68213 +relay.nostrzh.org,43.6532,-79.3832 +relay.angor.io,48.1046,11.6002 +alienos.libretechsystems.xyz,55.4724,9.87335 +vault.iris.to,43.6532,-79.3832 +relay.mccormick.cx,52.3563,4.95714 +nostr.quali.chat,60.1699,24.9384 +wheat.happytavern.co,43.6532,-79.3832 +relay.olas.app,50.4754,12.3683 +nostr-relayrs.gateway.in.th,15.2634,100.344 +relay.snort.social,53.3498,-6.26031 +nostr-2.21crypto.ch,47.5356,8.73209 +pyramid.treegaze.com,43.6532,-79.3832 +relay.smies.me,33.7501,-84.3885 +wot.dergigi.com,64.1476,-21.9392 +nostr-relay.zimage.com,34.0549,-118.243 +nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874 +nostr.jerrynya.fun,31.2304,121.474 +purplerelay.com,50.1109,8.68213 +relay.comcomponent.com,34.7062,135.493 +relay.unitypay.cash,41.4513,-81.7021 +nostr.mikoshi.de,50.1109,8.68213 +prl.plus,42.6978,23.3246 +shu04.shugur.net,25.2604,55.2989 +nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832 +nostr.zoracle.org,45.6018,-121.185 +nostriches.club,43.6532,-79.3832 +nostr.notribe.net,40.8302,-74.1299 +nostr.vulpem.com,49.4543,11.0746 +bucket.coracle.social,37.7775,-122.397 +wot.yesnostr.net,50.9871,2.12554 +wot.nostr.place,32.7767,-96.797 +nostr.mehdibekhtaoui.com,49.4939,-1.54813 +relay.getsafebox.app,43.6532,-79.3832 +nostr2.girino.org,43.6532,-79.3832 +nostr.blankfors.se,60.1699,24.9384 +premium.primal.net,43.6532,-79.3832 +nostr.rikmeijer.nl,50.4754,12.3683 +relay-fra.zombi.cloudrodion.com,48.8566,2.35222 +adre.su,59.9311,30.3609 +nostr.n7ekb.net,47.4941,-122.294 +nostr.hekster.org,37.3986,-121.964 +relay.jabato.space,52.52,13.405 +fenrir-s.notoshi.win,43.6532,-79.3832 +notemine.io,52.2026,20.9397 +r.bitcoinhold.net,43.6532,-79.3832 +nostr-pub.wellorder.net,45.5201,-122.99 +articles.layer3.news,37.3387,-121.885 +relays.diggoo.com,43.6532,-79.3832 +relayb.uid.ovh,43.6532,-79.3832 +nostr.thebiglake.org,32.71,-96.6745 +chat-relay.zap-work.com,43.6532,-79.3832 +nr.yay.so,46.2126,6.1154 +shu01.shugur.net,21.4902,39.2246 +khatru.nostrver.se,51.1792,5.89444 +relay.openfarmtools.org,60.1699,24.9384 +relay01.lnfi.network,39.0997,-94.5786 +nostrja-kari.heguro.com,43.6532,-79.3832 +nostr.snowbla.de,60.1699,24.9384 +relay.satlantis.io,32.8769,-80.0114 +relay.vrtmrz.net,43.6532,-79.3832 +purpura.cloud,43.6532,-79.3832 +orangepiller.org,60.1699,24.9384 +relay.coinos.io,43.6532,-79.3832 +relay.layer.systems,49.0291,8.35695 +relay.toastr.net,40.8054,-74.0241 +ynostr.yael.at,60.1699,24.9384 +ribo.eu.nostria.app,52.3676,4.90414 +relay.nostrcheck.me,43.6532,-79.3832 +relay.primal.net,43.6532,-79.3832 +relay-testnet.k8s.layer3.news,37.3387,-121.885 +relay.threenine.services,51.5524,-0.29686 +relay.nostr.net,43.6532,-79.3832 +nostr.middling.mydns.jp,35.8099,140.12 +soloco.nl,43.6532,-79.3832 +nostr.4rs.nl,49.0291,8.35696 +no.str.cr,9.92857,-84.0528 +espelho.girino.org,43.6532,-79.3832 +nostr.hifish.org,47.4043,8.57398 +wot.sebastix.social,51.1792,5.89444 +relay03.lnfi.network,39.0997,-94.5786 +relay.nosto.re,51.1792,5.89444 +relay.nostrdice.com,-33.8688,151.209 +nostr.agentcampfire.com,52.3676,4.90414 +nostr.night7.space,50.4754,12.3683 +nostr.nodesmap.com,59.3327,18.0656 +relayone.soundhsa.com,33.1384,-95.6011 +relay.illuminodes.com,47.6061,-122.333 +nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832 +nostr.robosats.org,64.1476,-21.9392 +relay.seq1.net,43.6532,-79.3832 +strfry.shock.network,39.0438,-77.4874 +nostr.ovia.to,43.6532,-79.3832 +relay.holzeis.me,43.6532,-79.3832 +bcast.seutoba.com.br,43.6532,-79.3832 +relay.libernet.app,43.6532,-79.3832 +nostr-01.uid.ovh,43.6532,-79.3832 +nostr.luisschwab.net,43.6532,-79.3832 +strfry.elswa-dev.online,50.1109,8.68213 +relay.nostriot.com,41.5695,-83.9786 +nostr.oxtr.dev,50.4754,12.3683 +nostr.mom,50.4754,12.3683 +nostr-03.dorafactory.org,1.35208,103.82 +relay.camelus.app,45.5201,-122.99 +strfry.openhoofd.nl,51.9229,4.40833 +nos.lol,50.4754,12.3683 +nostr.bitcoiner.social,39.1585,-94.5728 +relay.islandbitcoin.com,12.8498,77.6545 +relay.tagayasu.xyz,43.6715,-79.38 +dev-nostr.bityacht.io,25.0797,121.234 +relay.nostrhub.fr,48.1045,11.6004 +relay.satmaxt.xyz,43.6532,-79.3832 +yabu.me,35.6092,139.73 +relay.samt.st,40.8302,-74.1299 +relay02.lnfi.network,39.0997,-94.5786 +nostr.88mph.life,51.5072,-0.127586 +dev-relay.lnfi.network,39.0997,-94.5786 +relay.goodmorningbitcoin.com,43.6532,-79.3832 +nostrelay.memory-art.xyz,43.6532,-79.3832 +relay.degmods.com,50.4754,12.3683 +nostr-02.yakihonne.com,1.32123,103.695 +nostr.spicyz.io,43.6532,-79.3832 +relay.minibolt.info,43.6532,-79.3832 +bcast.girino.org,43.6532,-79.3832 +nostr.bilthon.dev,25.8128,-80.2377 +relay.bitcoinartclock.com,50.4754,12.3683 +cyberspace.nostr1.com,40.7128,-74.006 +nostr.data.haus,50.4754,12.3683 +relay.agora.social,50.7383,15.0648 +relay.wavefunc.live,34.0362,-118.443 +nostr.casa21.space,43.6532,-79.3832 +relay.mostro.network,40.8302,-74.1299 relay.ditto.pub,43.6532,-79.3832 +nostr-relay.amethyst.name,39.0438,-77.4874 +relay.credenso.cafe,43.3601,-80.3127 +nostr.calitabby.net,39.9268,-75.0246 +relay.magiccity.live,25.8128,-80.2377 +nostr.chaima.info,51.223,6.78245 +wot.brightbolt.net,47.6735,-116.781 +nostr.sathoarder.com,48.5734,7.75211 +inbox.azzamo.net,52.2633,21.0283 +nostr.na.social,43.6532,-79.3832 +nostr.myshosholoza.co.za,52.3676,4.90414 +nostr.spaceshell.xyz,43.6532,-79.3832 +relay.wellorder.net,45.5201,-122.99 +nostr.0x7e.xyz,47.4988,8.72369 +nostr-relay.cbrx.io,43.6532,-79.3832 +relay.btcforplebs.com,43.6532,-79.3832 +bitcoiner.social,39.1585,-94.5728 +relaynostr.breadslice.com,43.6532,-79.3832 +nostr.overmind.lol,43.6532,-79.3832 +santo.iguanatech.net,40.8302,-74.1299 +relay.lightning.pub,39.0438,-77.4874 +nostr.rblb.it,43.7094,10.6582 +relay.bitcoinveneto.org,64.1466,-21.9426 +relay.wolfcoil.com,35.6092,139.73 +nostr-relay.corb.net,38.8353,-104.822 +relay.nostr.place,32.7767,-96.797 +wot.soundhsa.com,33.1384,-95.6011 +relay.npubhaus.com,43.6532,-79.3832 +nostr-relay.psfoundation.info,39.0438,-77.4874 +x.kojira.io,43.6532,-79.3832 +relay.cypherflow.ai,48.8566,2.35222 From 54c96bd7370f572a9b3a5216355a50d6decac218 Mon Sep 17 00:00:00 2001 From: Rebroad Date: Sun, 4 Jan 2026 01:41:38 -0500 Subject: [PATCH 10/10] Fix: Add @ConscryptMode annotation to FileTransferTest to resolve UnsatisfiedLinkError (#543) Robolectric 4.9+ uses Conscrypt as the default security provider, which requires native libraries that aren't available in the test environment. Adding @ConscryptMode(Mode.OFF) disables Conscrypt and uses BouncyCastle instead, which resolves the test failures. This fixes the build failures in FileTransferTest where all 9 tests were failing with UnsatisfiedLinkError when Conscrypt tried to load native libraries. Fixes #542 --- app/src/test/kotlin/com/bitchat/FileTransferTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/test/kotlin/com/bitchat/FileTransferTest.kt b/app/src/test/kotlin/com/bitchat/FileTransferTest.kt index 1798f5fe..31131540 100644 --- a/app/src/test/kotlin/com/bitchat/FileTransferTest.kt +++ b/app/src/test/kotlin/com/bitchat/FileTransferTest.kt @@ -8,12 +8,14 @@ import org.junit.Assert.assertNotNull import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.ConscryptMode import java.io.File import java.nio.ByteBuffer import java.nio.ByteOrder import java.util.Date @RunWith(RobolectricTestRunner::class) +@ConscryptMode(ConscryptMode.Mode.OFF) // Disable Conscrypt to avoid native library loading issues class FileTransferTest { @Test