diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | 7 |
1 files changed, 7 insertions, 0 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 9fa5e44..2dd1c46 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt | |||
@@ -117,6 +117,7 @@ class StartActivity : BaseActivity() { | |||
117 | } | 117 | } |
118 | 118 | ||
119 | private val startupBroadcastReceiver = SimpleBroadcastReceiver(IntentFilter(Actions.EVENT_CONNECTED), this::onVpnStart) | 119 | private val startupBroadcastReceiver = SimpleBroadcastReceiver(IntentFilter(Actions.EVENT_CONNECTED), this::onVpnStart) |
120 | private val errorBroadcastReceiver = SimpleBroadcastReceiver(IntentFilter(Actions.EVENT_ABORTED), this::onVpnStartError) | ||
120 | 121 | ||
121 | private var connectDialog: ProgressDialog? = null | 122 | private var connectDialog: ProgressDialog? = null |
122 | 123 | ||
@@ -148,10 +149,12 @@ class StartActivity : BaseActivity() { | |||
148 | super.onResume() | 149 | super.onResume() |
149 | if (TincVpnService.isConnected()) openStatusActivity() | 150 | if (TincVpnService.isConnected()) openStatusActivity() |
150 | startupBroadcastReceiver.register() | 151 | startupBroadcastReceiver.register() |
152 | errorBroadcastReceiver.register() | ||
151 | } | 153 | } |
152 | 154 | ||
153 | override fun onPause() { | 155 | override fun onPause() { |
154 | startupBroadcastReceiver.unregister() | 156 | startupBroadcastReceiver.unregister() |
157 | errorBroadcastReceiver.unregister() | ||
155 | super.onPause() | 158 | super.onPause() |
156 | } | 159 | } |
157 | 160 | ||
@@ -169,6 +172,10 @@ class StartActivity : BaseActivity() { | |||
169 | finish() | 172 | finish() |
170 | } | 173 | } |
171 | 174 | ||
175 | private fun onVpnStartError() { | ||
176 | connectDialog?.dismiss() | ||
177 | } | ||
178 | |||
172 | private fun openStatusActivity() = | 179 | private fun openStatusActivity() = |
173 | startActivity(Intent(this, StatusActivity::class.java)) | 180 | startActivity(Intent(this, StatusActivity::class.java)) |
174 | } | 181 | } |