aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfo.kt12
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfo.kt4
-rw-r--r--build.gradle2
3 files changed, 9 insertions, 9 deletions
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,
76 ofNodeDump(NODE_DUMP_PATTERN.matcher(line).apply { find() }) 76 ofNodeDump(NODE_DUMP_PATTERN.matcher(line).apply { find() })
77 77
78 private fun ofNodeDump(matcher: Matcher) = NodeInfo( 78 private fun ofNodeDump(matcher: Matcher) = NodeInfo(
79 name = matcher[1], 79 name = matcher[1]!!,
80 id = matcher[2], 80 id = matcher[2]!!,
81 ip = matcher[3], 81 ip = matcher[3]!!,
82 port = matcher[4], 82 port = matcher[4]!!,
83 cipher = matcher[5]!!.toInt(), 83 cipher = matcher[5]!!.toInt(),
84 digest = matcher[6]!!.toInt(), 84 digest = matcher[6]!!.toInt(),
85 macLength = matcher[7]!!.toInt(), 85 macLength = matcher[7]!!.toInt(),
86 compression = matcher[8]!!.toInt(), 86 compression = matcher[8]!!.toInt(),
87 options = matcher[9]!!.toInt(16), 87 options = matcher[9]!!.toInt(16),
88 status = matcher[10]!!.toInt(16), 88 status = matcher[10]!!.toInt(16),
89 nextHop = matcher[11], 89 nextHop = matcher[11]!!,
90 via = matcher[12], 90 via = matcher[12]!!,
91 distance = matcher[13]!!.toInt(), 91 distance = matcher[13]!!.toInt(),
92 pMtu = matcher[14]!!.toInt(), 92 pMtu = matcher[14]!!.toInt(),
93 minMtu = matcher[15]!!.toInt(), 93 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 @@
1/* 1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 3 * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
4 * 4 *
5 * This program is free software: you can redistribute it and/or modify 5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * 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) {
30 private val SUBNET_DUMP_PATTERN by lazy { Pattern.compile(SUBNET_DUMP_PATTERN_STRING) } 30 private val SUBNET_DUMP_PATTERN by lazy { Pattern.compile(SUBNET_DUMP_PATTERN_STRING) }
31 31
32 fun ofSubnetDump(line: String) = ofSubnetDump(SUBNET_DUMP_PATTERN.matcher(line).apply { find() }) 32 fun ofSubnetDump(line: String) = ofSubnetDump(SUBNET_DUMP_PATTERN.matcher(line).apply { find() })
33 private fun ofSubnetDump(matcher: Matcher) = SubnetInfo(ipRange = matcher[1], owner = matcher[2]) 33 private fun ofSubnetDump(matcher: Matcher) = SubnetInfo(ipRange = matcher[1]!!, owner = matcher[2]!!)
34 private operator fun Matcher.get(index: Int) = group(index) 34 private operator fun Matcher.get(index: Int) = group(index)
35 } 35 }
36} 36}
diff --git a/build.gradle b/build.gradle
index 4706d96..91c8152 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@
19// Top-level build file where you can add configuration options common to all sub-projects/modules. 19// Top-level build file where you can add configuration options common to all sub-projects/modules.
20 20
21buildscript { 21buildscript {
22 ext.kotlin_version = '1.3.61' 22 ext.kotlin_version = '1.4.20'
23 23
24 repositories { 24 repositories {
25 jcenter() 25 jcenter()