4 files changed, 160 insertions, 48 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
index 19d01e6..cecd474 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.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.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -13,16 +14,30 @@ import kotlinx.android.synthetic.main.page_start.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.service.TincVpnService
+import org.pacien.tincapp.utils.FileObserver
+import org.pacien.tincapp.utils.setElements
 
 /**
  * @author pacien
  */
-class StartActivity : BaseActivity(), AdapterView.OnItemClickListener {
+class StartActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
+
+    private var networkListAdapter: ArrayAdapter<String>? = null
+    private var confChangeObserver: FileObserver? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        networkListAdapter = ArrayAdapter<String>(this, R.layout.fragment_list_item)
+        confChangeObserver = FileObserver(AppPaths.confDir().absolutePath, FileObserver.CHANGE, { _, _ -> onRefresh() })
+
         layoutInflater.inflate(R.layout.page_start, main_content)
-        writeContent()
+        network_list_wrapper.setOnRefreshListener(this)
+        network_list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_list_header, network_list, false), null, false)
+        network_list.addFooterView(View(this), null, false)
+        network_list.emptyView = network_list_empty
+        network_list.adapter = networkListAdapter
+        network_list.onItemClickListener = this
     }
 
     override fun onCreateOptionsMenu(m: Menu): Boolean {
@@ -30,27 +45,44 @@ class StartActivity : BaseActivity(), AdapterView.OnItemClickListener {
         return super.onCreateOptionsMenu(m)
     }
 
-    override fun onResume() {
-        super.onResume()
+    override fun onDestroy() {
+        confChangeObserver = null
+        networkListAdapter = null
+        super.onDestroy()
+    }
 
-        if (TincVpnService.isConnected()) startActivity(Intent(this, StatusActivity::class.java)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK))
+    override fun onStart() {
+        super.onRestart()
+        onRefresh()
+        confChangeObserver?.startWatching()
     }
 
-    override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        PromptActivity.requestVpnPermission((view as TextView).text.toString())
+    override fun onStop() {
+        super.onStop()
+        confChangeObserver?.stopWatching()
     }
 
-    fun openConfigureActivity(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
-        startActivity(Intent(this, ConfigureActivity::class.java))
+    override fun onResume() {
+        super.onResume()
+        if (TincVpnService.isConnected()) openStatusActivity()
     }
 
-    private fun writeContent() {
-        network_list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_list_header, network_list, false), null, false)
-        network_list.addFooterView(View(this), null, false)
-        network_list.emptyView = network_list_empty
-        network_list.adapter = ArrayAdapter<String>(this, R.layout.fragment_list_item, AppPaths.confDir().list())
-        network_list.onItemClickListener = this
+    override fun onRefresh() {
+        val networks = AppPaths.confDir().list().toList()
+        runOnUiThread {
+            networkListAdapter?.setElements(networks)
+            network_list_wrapper.isRefreshing = false
+        }
     }
 
+    override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) =
+            PromptActivity.requestVpnPermission((view as TextView).text.toString())
+
+    fun openConfigureActivity(@Suppress("UNUSED_PARAMETER") i: MenuItem) =
+            startActivity(Intent(this, ConfigureActivity::class.java))
+
+    fun openStatusActivity() =
+            startActivity(Intent(this, StatusActivity::class.java)
+                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK))
+
 }
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