1 files changed, 73 insertions, 32 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index ca572ea..b4ba7dd 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -2,6 +2,7 @@ package org.pacien.tincapp.activities
 
 import android.content.Intent
 import android.os.Bundle
+import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.app.AlertDialog
 import android.view.Menu
 import android.view.MenuItem
@@ -17,16 +18,33 @@ import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.service.TincVpnService
 import org.pacien.tincapp.service.VpnInterfaceConfiguration
+import org.pacien.tincapp.utils.setElements
+import org.pacien.tincapp.utils.setText
+import java.util.*
+import kotlin.concurrent.timerTask
 
 /**
  * @author pacien
  */
-class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener {
+class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
+
+    private var nodeListAdapter: ArrayAdapter<String>? = null
+    private var refreshTimer: Timer? = null
+    private var updateView: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        nodeListAdapter = ArrayAdapter<String>(this, R.layout.fragment_list_item)
+        refreshTimer = Timer(true)
+
         layoutInflater.inflate(R.layout.page_status, main_content)
-        writeContent()
+        node_list_wrapper.setOnRefreshListener(this)
+        node_list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_status_header, node_list, false), null, false)
+        node_list.addFooterView(View(this), null, false)
+        node_list.emptyView = node_list_empty
+        node_list.onItemClickListener = this
+        node_list.adapter = nodeListAdapter
     }
 
     override fun onCreateOptionsMenu(m: Menu): Boolean {
@@ -34,55 +52,78 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener {
         return super.onCreateOptionsMenu(m)
     }
 
-    override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val nodeName = (view as TextView).text.toString()
-        val v = layoutInflater.inflate(R.layout.dialog_text_monopsace, main_content, false)
-        v.dialog_text_monospace.text = Tinc.info(TincVpnService.getCurrentNetName()!!, nodeName)
-
-        AlertDialog.Builder(this)
-                .setTitle(R.string.title_node_info)
-                .setView(v)
-                .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
-                .show()
+    override fun onDestroy() {
+        super.onDestroy()
+        refreshTimer?.cancel()
+        nodeListAdapter = null
+        refreshTimer = null
     }
 
-    fun stopVpn(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
-        TincVpnService.stopVpn()
-        startActivity(Intent(this, StartActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
-        finish()
+    override fun onStart() {
+        super.onStart()
+        writeNetworkInfo(TincVpnService.getCurrentInterfaceCfg() ?: VpnInterfaceConfiguration())
+        updateView = true
+        onRefresh()
+        updateNodeList()
     }
 
-    private fun TextView.setText(list: List<String>) {
-        if (list.isNotEmpty()) text = list.joinToString("\n")
-        else text = getString(R.string.value_none)
+    override fun onStop() {
+        super.onStop()
+        updateView = false
     }
 
-    private fun getNodeNames() = Tinc.dumpNodes(TincVpnService.getCurrentNetName()!!).map { it.substringBefore(" ") }
+    override fun onRefresh() {
+        val nodes = getNodeNames()
+        runOnUiThread {
+            nodeListAdapter?.setElements(nodes)
+            node_list_wrapper.isRefreshing = false
+        }
+    }
 
-    private fun writeContent() {
-        node_list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_status_header, node_list, false), null, false)
-        node_list.addFooterView(View(this), null, false)
-        node_list.emptyView = node_list_empty
-        node_list.onItemClickListener = this
-        node_list.adapter = ArrayAdapter<String>(this, R.layout.fragment_list_item, getNodeNames())
+    override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        val nodeName = (view as TextView).text.toString()
+        val dialogTextView = layoutInflater.inflate(R.layout.dialog_text_monopsace, main_content, false)
+        dialogTextView.dialog_text_monospace.text = Tinc.info(TincVpnService.getCurrentNetName()!!, nodeName)
 
-        text_network_name.text = TincVpnService.getCurrentNetName() ?: getString(R.string.value_none)
-        writeNetworkInfo(TincVpnService.getCurrentInterfaceCfg() ?: VpnInterfaceConfiguration())
+        AlertDialog.Builder(this)
+                .setTitle(R.string.title_node_info)
+                .setView(dialogTextView)
+                .setPositiveButton(R.string.action_close) { _, _ -> /* nop */ }
+                .show()
     }
 
-
-    private fun writeNetworkInfo(cfg: VpnInterfaceConfiguration) {
+    fun writeNetworkInfo(cfg: VpnInterfaceConfiguration) {
+        text_network_name.text = TincVpnService.getCurrentNetName() ?: getString(R.string.value_none)
         text_network_ip_addresses.setText(cfg.addresses.map { it.toString() })
         text_network_routes.setText(cfg.routes.map { it.toString() })
         text_network_dns_servers.setText(cfg.dnsServers)
         text_network_search_domains.setText(cfg.searchDomains)
         text_network_allow_bypass.text = getString(if (cfg.allowBypass) R.string.value_yes else R.string.value_no)
-
         block_network_allowed_applications.visibility = if (cfg.allowedApplications.isNotEmpty()) View.VISIBLE else View.GONE
         text_network_allowed_applications.setText(cfg.allowedApplications)
-
         block_network_disallowed_applications.visibility = if (cfg.disallowedApplications.isNotEmpty()) View.VISIBLE else View.GONE
         text_network_disallowed_applications.setText(cfg.disallowedApplications)
     }
 
+    fun updateNodeList() {
+        refreshTimer?.schedule(timerTask {
+            onRefresh()
+            if (updateView) updateNodeList()
+        }, REFRESH_RATE)
+    }
+
+    fun stopVpn(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
+        TincVpnService.stopVpn()
+        startActivity(Intent(this, StartActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
+        finish()
+    }
+
+    companion object {
+        private val REFRESH_RATE = 5000L
+
+        fun getNodeNames() =
+                if (TincVpnService.isConnected()) Tinc.dumpNodes(TincVpnService.getCurrentNetName()!!).map { it.substringBefore(" ") }
+                else emptyList()
+    }
+
 }