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

Refine parse to save battery

Browse Source
This commit is contained in:
Mygod
2018-01-21 20:47:55 -08:00
parent af2aaef2b0
commit 881e0d09e7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt
View File

@@ -25,14 +25,14 @@ data class IpNeighbour(val ip: String, val dev: String, val lladdr: String, val
fun parse(line: String): IpNeighbour? { fun parse(line: String): IpNeighbour? {
val match = parser.matchEntire(line) val match = parser.matchEntire(line)
if (match == null) { if (match == null) {
if (!line.isBlank()) Log.w(TAG, line) if (line.isNotEmpty()) Log.w(TAG, line)
return null return null
} }
val ip = match.groupValues[2] val ip = match.groupValues[2]
val dev = match.groupValues[4] val dev = match.groupValues[4]
var lladdr = checkLladdrNotLoopback(match.groupValues[6]) var lladdr = checkLladdrNotLoopback(match.groupValues[6])
// use ARP as fallback // use ARP as fallback
if (dev.isNotBlank() && lladdr.isBlank()) lladdr = checkLladdrNotLoopback(arp() if (dev.isNotEmpty() && lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp()
.filter { it[ARP_IP_ADDRESS] == ip && it[ARP_DEVICE] == dev } .filter { it[ARP_IP_ADDRESS] == ip && it[ARP_DEVICE] == dev }
.map { it[ARP_HW_ADDRESS] } .map { it[ARP_HW_ADDRESS] }
.singleOrNull() ?: "") .singleOrNull() ?: "")