diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | 10 |
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 | |||
72 | updateView = false | 72 | updateView = false |
73 | } | 73 | } |
74 | 74 | ||
75 | override fun onResume() { | ||
76 | super.onResume() | ||
77 | if (!TincVpnService.isConnected()) openStartActivity() | ||
78 | } | ||
79 | |||
75 | override fun onRefresh() { | 80 | override fun onRefresh() { |
76 | val nodes = getNodeNames() | 81 | val nodes = getNodeNames() |
77 | runOnUiThread { | 82 | runOnUiThread { |
78 | nodeListAdapter?.setElements(nodes) | 83 | nodeListAdapter?.setElements(nodes) |
79 | node_list_wrapper.isRefreshing = false | 84 | node_list_wrapper.isRefreshing = false |
85 | if (!TincVpnService.isConnected()) openStartActivity() | ||
80 | } | 86 | } |
81 | } | 87 | } |
82 | 88 | ||
@@ -114,10 +120,12 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef | |||
114 | 120 | ||
115 | fun stopVpn(@Suppress("UNUSED_PARAMETER") i: MenuItem) { | 121 | fun stopVpn(@Suppress("UNUSED_PARAMETER") i: MenuItem) { |
116 | TincVpnService.stopVpn() | 122 | TincVpnService.stopVpn() |
117 | startActivity(Intent(this, StartActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)) | 123 | openStartActivity() |
118 | finish() | 124 | finish() |
119 | } | 125 | } |
120 | 126 | ||
127 | fun openStartActivity() = startActivity(Intent(this, StartActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)) | ||
128 | |||
121 | companion object { | 129 | companion object { |
122 | private val REFRESH_RATE = 5000L | 130 | private val REFRESH_RATE = 5000L |
123 | 131 | ||