From 722855caf7d7bd7a0f11170dbc162656a7aec78d Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Thu, 4 Oct 2018 16:45:44 +0800
Subject: [PATCH] Refine code

---
 .../be/mygod/vpnhotspot/net/IpNeighbour.kt    | 49 +++++++++----------
 .../net/monitor/IpNeighbourMonitor.kt         |  4 +-
 2 files changed, 26 insertions(+), 27 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 15a48bb6..a6b8894b 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt
@@ -23,31 +23,30 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: String,
         private fun checkLladdrNotLoopback(lladdr: String) = if (lladdr == "00:00:00:00:00:00") "" else lladdr
 
         fun parse(line: String): IpNeighbour? {
-            val match = parser.matchEntire(line)!!
-            val ip = parseNumericAddress(match.groupValues[2])
-            val dev = match.groupValues[4]
-            var lladdr = checkLladdrNotLoopback(match.groupValues[6])
-            // use ARP as fallback
-            if (dev.isNotEmpty() && lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp()
-                    .asSequence()
-                    .filter { parseNumericAddress(it[ARP_IP_ADDRESS]) == ip && it[ARP_DEVICE] == dev }
-                    .map { it[ARP_HW_ADDRESS] }
-                    .singleOrNull() ?: "")
-            val state = if (match.groupValues[1].isNotEmpty() || lladdr.isEmpty()) State.DELETING else
-                when (match.groupValues[10]) {
-                    "", "INCOMPLETE" -> State.INCOMPLETE
-                    "REACHABLE", "DELAY", "STALE", "PROBE", "PERMANENT" -> State.VALID
-                    "FAILED" -> State.FAILED
-                    "NOARP" -> return null  // skip
-                    else -> throw IllegalArgumentException("Unknown state encountered: ${match.groupValues[10]}")
-                }
-            return IpNeighbour(ip, dev, lladdr, state)
-        }
-        fun parseNoThrow(line: String): IpNeighbour? = try {
-            parse(line)
-        } catch (e: Exception) {
-            Timber.w(IllegalArgumentException("Unable to parse line: $line", e))
-            null
+            return try {
+                val match = parser.matchEntire(line)!!
+                val ip = parseNumericAddress(match.groupValues[2])
+                val dev = match.groupValues[4]
+                var lladdr = checkLladdrNotLoopback(match.groupValues[6])
+                // use ARP as fallback
+                if (dev.isNotEmpty() && lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp()
+                        .asSequence()
+                        .filter { parseNumericAddress(it[ARP_IP_ADDRESS]) == ip && it[ARP_DEVICE] == dev }
+                        .map { it[ARP_HW_ADDRESS] }
+                        .singleOrNull() ?: "")
+                val state = if (match.groupValues[1].isNotEmpty() || lladdr.isEmpty()) State.DELETING else
+                    when (match.groupValues[10]) {
+                        "", "INCOMPLETE" -> State.INCOMPLETE
+                        "REACHABLE", "DELAY", "STALE", "PROBE", "PERMANENT" -> State.VALID
+                        "FAILED" -> State.FAILED
+                        "NOARP" -> return null  // skip
+                        else -> throw IllegalArgumentException("Unknown state encountered: ${match.groupValues[10]}")
+                    }
+                IpNeighbour(ip, dev, lladdr, state)
+            } catch (e: Exception) {
+                Timber.w(IllegalArgumentException("Unable to parse line: $line", e))
+                null
+            }
         }
 
         private val spaces = " +".toPattern()
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
index f284b640..2336f369 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
@@ -38,7 +38,7 @@ class IpNeighbourMonitor private constructor() : IpMonitor() {
 
     override fun processLine(line: String) {
         synchronized(neighbours) {
-            val neighbour = IpNeighbour.parseNoThrow(line) ?: return
+            val neighbour = IpNeighbour.parse(line) ?: return
             val changed = if (neighbour.state == IpNeighbour.State.DELETING)
                 neighbours.remove(neighbour.ip) != null
             else neighbours.put(neighbour.ip, neighbour) != neighbour
@@ -50,7 +50,7 @@ class IpNeighbourMonitor private constructor() : IpMonitor() {
         synchronized(neighbours) {
             neighbours.clear()
             neighbours.putAll(lines
-                    .map(IpNeighbour.Companion::parseNoThrow)
+                    .map(IpNeighbour.Companion::parse)
                     .filterNotNull()
                     .filter { it.state != IpNeighbour.State.DELETING }  // skip entries without lladdr
                     .associateBy { it.ip })