aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfo.kt36
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt44
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt57
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListLiveData.kt38
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListViewModel.kt30
-rw-r--r--app/src/main/java/org/pacien/tincapp/commands/Tinc.kt4
-rw-r--r--app/src/main/res/layout/status_node_list_fragment.xml (renamed from app/src/main/res/layout/status_node_list.xml)1
-rw-r--r--app/src/main/res/layout/status_subnet_list_fragment.xml38
-rw-r--r--app/src/main/res/layout/status_subnet_list_item.xml50
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/values/styles.xml1
13 files changed, 306 insertions, 5 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
index f47df6c..3815bc9 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
@@ -31,6 +31,7 @@ import org.pacien.tincapp.activities.common.ProgressModal
31import org.pacien.tincapp.activities.start.StartActivity 31import org.pacien.tincapp.activities.start.StartActivity
32import org.pacien.tincapp.activities.status.networkinfo.NetworkInfoFragment 32import org.pacien.tincapp.activities.status.networkinfo.NetworkInfoFragment
33import org.pacien.tincapp.activities.status.nodes.NodeListFragment 33import org.pacien.tincapp.activities.status.nodes.NodeListFragment
34import org.pacien.tincapp.activities.status.subnets.SubnetListFragment
34import org.pacien.tincapp.activities.viewlog.ViewLogActivity 35import org.pacien.tincapp.activities.viewlog.ViewLogActivity
35import org.pacien.tincapp.intent.Actions 36import org.pacien.tincapp.intent.Actions
36import org.pacien.tincapp.intent.BroadcastMapper 37import org.pacien.tincapp.intent.BroadcastMapper
@@ -46,7 +47,8 @@ class StatusActivity : BaseActivity() {
46 private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown)) 47 private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown))
47 private val pages = listOf( 48 private val pages = listOf(
48 R.string.status_activity_title_network_info to NetworkInfoFragment(), 49 R.string.status_activity_title_network_info to NetworkInfoFragment(),
49 R.string.status_activity_title_node_list to NodeListFragment() 50 R.string.status_activity_title_node_list to NodeListFragment(),
51 R.string.status_activity_title_subnet_list to SubnetListFragment()
50 ) 52 )
51 53
52 private var shutdownDialog: AlertDialog? = null 54 private var shutdownDialog: AlertDialog? = null
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt
index 1f762c0..1111de7 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt
@@ -28,7 +28,7 @@ import android.view.View
28import android.view.ViewGroup 28import android.view.ViewGroup
29import kotlinx.android.synthetic.main.base.* 29import kotlinx.android.synthetic.main.base.*
30import kotlinx.android.synthetic.main.status_node_info_dialog.view.* 30import kotlinx.android.synthetic.main.status_node_info_dialog.view.*
31import kotlinx.android.synthetic.main.status_node_list.* 31import kotlinx.android.synthetic.main.status_node_list_fragment.*
32import org.pacien.tincapp.R 32import org.pacien.tincapp.R
33import org.pacien.tincapp.commands.Tinc 33import org.pacien.tincapp.commands.Tinc
34import org.pacien.tincapp.extensions.hideBottomSeparator 34import org.pacien.tincapp.extensions.hideBottomSeparator
@@ -53,7 +53,7 @@ class NodeListFragment : Fragment() {
53 } 53 }
54 54
55 override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { 55 override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
56 return inflater.inflate(R.layout.status_node_list, container, false) 56 return inflater.inflate(R.layout.status_node_list_fragment, container, false)
57 } 57 }
58 58
59 override fun onViewCreated(view: View, savedInstanceState: Bundle?) { 59 override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
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
new file mode 100644
index 0000000..57c7ca1
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfo.kt
@@ -0,0 +1,36 @@
1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
4 *
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
7 * the Free Software Foundation, either version 3 of the License, or
8 * (at your option) any later version.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <https://www.gnu.org/licenses/>.
17 */
18
19package org.pacien.tincapp.activities.status.subnets
20
21import java.util.regex.Matcher
22import java.util.regex.Pattern
23
24/**
25 * @author pacien
26 */
27data class SubnetInfo(val ipRange: String, val owner: String) {
28 companion object {
29 private const val SUBNET_DUMP_PATTERN_STRING = "(\\S+) owner (\\S+)"
30 private val SUBNET_DUMP_PATTERN by lazy { Pattern.compile(SUBNET_DUMP_PATTERN_STRING) }
31
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])
34 private operator fun Matcher.get(index: Int) = group(index)
35 }
36}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt
new file mode 100644
index 0000000..a5e4a1d
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetInfoArrayAdapter.kt
@@ -0,0 +1,44 @@
1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
4 *
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
7 * the Free Software Foundation, either version 3 of the License, or
8 * (at your option) any later version.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <https://www.gnu.org/licenses/>.
17 */
18
19package org.pacien.tincapp.activities.status.subnets
20
21import android.content.Context
22import android.databinding.DataBindingUtil
23import android.view.LayoutInflater
24import android.view.View
25import android.view.ViewGroup
26import android.widget.ArrayAdapter
27import org.pacien.tincapp.databinding.StatusSubnetListItemBinding
28
29/**
30 * @author pacien
31 */
32class SubnetInfoArrayAdapter(context: Context?) : ArrayAdapter<SubnetInfo>(context, -1) {
33 private val layoutInflater = LayoutInflater.from(context)!!
34
35 override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
36 val binding = when (convertView) {
37 null -> StatusSubnetListItemBinding.inflate(layoutInflater, parent, false)
38 else -> DataBindingUtil.getBinding(convertView)!!
39 }
40
41 binding.subnetInfo = getItem(position)
42 return binding.root
43 }
44}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt
new file mode 100644
index 0000000..084ec68
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/subnets/SubnetListFragment.kt
@@ -0,0 +1,57 @@
1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
4 *
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
7 * the Free Software Foundation, either version 3 of the License, or
8 * (at your option) any later version.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <https://www.gnu.org/licenses/>.
17 */
18
19package org.pacien.tincapp.activities.status.subnets
20
21import android.arch.lifecycle.Observer
22import android.arch.lifecycle.ViewModelProviders
23import android.os.Bundle
24import android.support.v4.app.Fragment
25import android.view.LayoutInflater
26import android.view.View
27import android.view.ViewGroup
28import kotlinx.android.synthetic.main.status_subnet_list_fragment.*
29import org.pacien.tincapp.R
30import org.pacien.tincapp.extensions.hideBottomSeparator
31import org.pacien.tincapp.extensions.hideTopSeparator
32import org.pacien.tincapp.extensions.setElements
33
34/**
35 * @author pacien
36 */
37class SubnetListFragment