From 9c0aa8bd9dc694854b5c4b5eb07ef4d8942709a8 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 6 Dec 2020 03:17:05 +0100
Subject: project: update to kotlin 1.4.20 and fix new warnings

---
 .../org/pacien/tincapp/activities/status/nodes/NodeInfo.kt   | 12 ++++++------
 .../pacien/tincapp/activities/status/subnets/SubnetInfo.kt   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfo.kt b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfo.kt
index 6523250..04f6f49 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfo.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfo.kt
@@ -76,18 +76,18 @@ data class NodeInfo(val name: String,
       ofNodeDump(NODE_DUMP_PATTERN.matcher(line).apply { find() })
 
     private fun ofNodeDump(matcher: Matcher) = NodeInfo(
-      name = matcher[1],
-      id = matcher[2],
-      ip = matcher[3],
-      port = matcher[4],
+      name = matcher[1]!!,
+      id = matcher[2]!!,
+      ip = matcher[3]!!,
+      port = matcher[4]!!,
       cipher = matcher[5]!!.toInt(),
       digest = matcher[6]!!.toInt(),
       macLength = matcher[7]!!.toInt(),
       compression = matcher[8]!!.toInt(),
       options = matcher[9]!!.toInt(16),
       status = matcher[10]!!.toInt(16),
-      nextHop = matcher[11],
-      via = matcher[12],
+      nextHop = matcher[11]!!,
+      via = matcher[12]!!,
       distance = matcher[13]!!.toInt(),
       pMtu = matcher[14]!!.toInt(),
       minMtu = matcher[15]!!.toInt(),
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfo.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfo.kt
index 57c7ca1..da064f0 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfo.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfo.kt
@@ -1,6 +1,6 @@
 /*
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ data class SubnetInfo(val ipRange: String, val owner: String) {
     private val SUBNET_DUMP_PATTERN by lazy { Pattern.compile(SUBNET_DUMP_PATTERN_STRING) }
 
     fun ofSubnetDump(line: String) = ofSubnetDump(SUBNET_DUMP_PATTERN.matcher(line).apply { find() })
-    private fun ofSubnetDump(matcher: Matcher) = SubnetInfo(ipRange = matcher[1], owner = matcher[2])
+    private fun ofSubnetDump(matcher: Matcher) = SubnetInfo(ipRange = matcher[1]!!, owner = matcher[2]!!)
     private operator fun Matcher.get(index: Int) = group(index)
   }
 }
-- 
cgit v1.2.3