From 881e0d09e7873526f896d0ac99881a729ff189e0 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 21 Jan 2018 20:47:55 -0800 Subject: [PATCH] Refine parse to save battery --- mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt index f73c6c72..d3b41b46 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt @@ -25,14 +25,14 @@ data class IpNeighbour(val ip: String, val dev: String, val lladdr: String, val fun parse(line: String): IpNeighbour? { val match = parser.matchEntire(line) if (match == null) { - if (!line.isBlank()) Log.w(TAG, line) + if (line.isNotEmpty()) Log.w(TAG, line) return null } val ip = match.groupValues[2] val dev = match.groupValues[4] var lladdr = checkLladdrNotLoopback(match.groupValues[6]) // 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 } .map { it[ARP_HW_ADDRESS] } .singleOrNull() ?: "")