Add subnet list tab to status activity

8 files changed, 214 insertions, 3 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
 import org.pacien.tincapp.activities.start.StartActivity
 import org.pacien.tincapp.activities.status.networkinfo.NetworkInfoFragment
 import org.pacien.tincapp.activities.status.nodes.NodeListFragment
+import org.pacien.tincapp.activities.status.subnets.SubnetListFragment
 import org.pacien.tincapp.activities.viewlog.ViewLogActivity
 import org.pacien.tincapp.intent.Actions
 import org.pacien.tincapp.intent.BroadcastMapper
@@ -46,7 +47,8 @@ class StatusActivity : BaseActivity() {
   private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown))
   private val pages = listOf(
     R.string.status_activity_title_network_info to NetworkInfoFragment(),
-    R.string.status_activity_title_node_list to NodeListFragment()
+    R.string.status_activity_title_node_list to NodeListFragment(),
+    R.string.status_activity_title_subnet_list to SubnetListFragment()
   )
 
   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
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.base.*
 import kotlinx.android.synthetic.main.status_node_info_dialog.view.*
-import kotlinx.android.synthetic.main.status_node_list.*
+import kotlinx.android.synthetic.main.status_node_list_fragment.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.extensions.hideBottomSeparator
@@ -53,7 +53,7 @@ class NodeListFragment : Fragment() {
   }
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-    return inflater.inflate(R.layout.status_node_list, container, false)
+    return inflater.inflate(R.layout.status_node_list_fragment, container, false)
   }
 
   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 @@
+/*
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.pacien.tincapp.activities.status.subnets
+
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+/**
+ * @author pacien
+ */
+data class SubnetInfo(val ipRange: String, val owner: String) {
+  companion object {
+    private const val SUBNET_DUMP_PATTERN_STRING = "(\\S+) owner (\\S+)"
+    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 operator fun Matcher.get(index: Int) = group(index)
+  }
+}
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 @@
+/*
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.pacien.tincapp.activities.status.subnets
+
+import android.content.Context
+import android.databinding.DataBindingUtil
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import org.pacien.tincapp.databinding.StatusSubnetListItemBinding
+
+/**
+ * @author pacien
+ */
+class SubnetInfoArrayAdapter(context: Context?) : ArrayAdapter<SubnetInfo>(context, -1) {
+  private val layoutInflater = LayoutInflater.from(context)!!
+
+  override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+    val binding = when (convertView) {
+      null -> StatusSubnetListItemBinding.inflate(layoutInflater, parent, false)
+      else -> DataBindingUtil.getBinding(convertView)!!
+    }
+
+    binding.subnetInfo = getItem(position)
+    return binding.root
+  }
+}
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 @@
+/*
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.pacien.tincapp.activities.status.subnets
+
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.status_subnet_list_fragment.*
+import org.pacien.tincapp.R
+import org.pacien.tincapp.extensions.hideBottomSeparator
+import org.pacien.tincapp.extensions.hideTopSeparator
+import org.pacien.tincapp.extensions.setElements
+
+/**
+ * @author pacien
+ */
+class SubnetListFragment : Fragment() {
+  private val subnetListViewModel by lazy { ViewModelProviders.of(this).get(SubnetListViewModel::class.java) }