brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer p2p client list

Browse Source
This commit is contained in:
Mygod
2018-02-10 23:03:45 -08:00
parent 70468bfbd1
commit 7f31b63394
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
View File

@@ -101,14 +101,13 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
fun recreate() { fun recreate() {
clients.clear() clients.clear()
val map = HashMap(p2p.associateBy { it.deviceAddress }) val p2p = HashMap(p2p.associateBy { it.deviceAddress })
for (neighbour in neighbours) { for (neighbour in neighbours)
val client = map.remove(neighbour.lladdr) if (neighbour.dev == p2pInterface) {
if (client != null) clients.add(Client(client, neighbour)) val client = p2p.remove(neighbour.lladdr)
else if (tetheredInterfaces.contains(neighbour.dev) || neighbour.dev == p2pInterface) if (client != null) clients.add(Client(client, neighbour))
clients.add(Client(neighbour = neighbour)) } else if (tetheredInterfaces.contains(neighbour.dev)) clients.add(Client(neighbour = neighbour))
} clients.addAll(p2p.map { Client(it.value) })
clients.addAll(map.map { Client(it.value) })
clients.sortWith(compareBy<Client> { it.ip }.thenBy { it.mac }) clients.sortWith(compareBy<Client> { it.ip }.thenBy { it.mac })
notifyDataSetChanged() // recreate everything notifyDataSetChanged() // recreate everything
binding.swipeRefresher.isRefreshing = false binding.swipeRefresher.isRefreshing = false