From 3bc69093654f61c723a70bca9d57ffd57062cb2f Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 15 Sep 2019 05:44:25 +0200
Subject: notify user of missing vpn permission

---
 .../java/org/pacien/tincapp/activities/start/StartActivity.kt  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
index 0e50060..877492d 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/start/StartActivity.kt
@@ -1,6 +1,6 @@
 /*
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@ import org.pacien.tincapp.activities.common.ProgressModal
 import org.pacien.tincapp.activities.common.RecentCrashHandler
 import org.pacien.tincapp.activities.configure.ConfigureActivity
 import org.pacien.tincapp.activities.status.StatusActivity
+import org.pacien.tincapp.context.App
 import org.pacien.tincapp.intent.Actions
 import org.pacien.tincapp.intent.BroadcastMapper
 import org.pacien.tincapp.service.TincVpnService
@@ -86,10 +87,15 @@ class StartActivity : BaseActivity() {
   }
 
   override fun onActivityResult(request: Int, result: Int, data: Intent?): Unit = when (request) {
-    permissionRequestCode -> if (result == Activity.RESULT_OK) connectionStarter.tryStart() else Unit
+    permissionRequestCode -> continueConnectionStart(result)
     else -> throw IllegalArgumentException("Result for unknown request received.")
   }
 
+  private fun continueConnectionStart(result: Int): Unit = when (result) {
+    Activity.RESULT_OK -> connectionStarter.tryStart()
+    else -> App.alert(R.string.notification_error_title_unable_to_start_tinc, getString(R.string.notification_error_message_could_not_bind_iface))
+  }
+
   private fun onVpnStart() {
     connectDialog?.dismiss()
     if (connectionStarter.displayStatus()) openStatusActivity()
-- 
cgit v1.2.3