Return to start screen if VPN disconnected by other means

1 files changed, 9 insertions, 1 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 b4ba7dd..44f4f89 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -72,11 +72,17 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
         updateView = false
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (!TincVpnService.isConnected()) openStartActivity()
+    }
+
     override fun onRefresh() {
         val nodes = getNodeNames()
         runOnUiThread {
             nodeListAdapter?.setElements(nodes)
             node_list_wrapper.isRefreshing = false
+            if (!TincVpnService.isConnected()) openStartActivity()
         }
     }
 
@@ -114,10 +120,12 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
 
     fun stopVpn(@Suppress("UNUSED_PARAMETER") i: MenuItem) {
         TincVpnService.stopVpn()
-        startActivity(Intent(this, StartActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
+        openStartActivity()
         finish()
     }
 
+    fun openStartActivity() = startActivity(Intent(this, StartActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
+
     companion object {
         private val REFRESH_RATE = 5000L