From 7eca0a4b1b8a9a1852cd3378f8ce0d999193451a Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 18 Feb 2020 04:13:52 +0200
Subject: [PATCH] - Let user fix the Settings that prevented baresip from
 starting.

---
 .../com/tutpro/baresip/BaresipService.kt      |  6 ----
 .../kotlin/com/tutpro/baresip/MainActivity.kt | 29 +++++++++----------
 app/src/main/res/values-fi/strings.xml        |  7 ++---
 app/src/main/res/values/strings.xml           |  4 +--
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 72ebbd25..b10000c7 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -847,12 +847,6 @@ class BaresipService: Service() {
     fun stopped(error: String) {
         Log.d(LOG_TAG, "Received 'stopped' from baresip with param '$error'")
         isServiceRunning = false
-        if (error == "ua_init") {
-            Config.removeVariable("sip_listen")
-            Config.removeVariable("net_interface")
-            Config.removeVariable("sip_certificate")
-            Config.removeVariable("sip_cafile")
-        }
         val intent = Intent("service event")
         intent.putExtra("event", "stopped")
         intent.putExtra("params", arrayListOf(error))
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index bb30958e..2ccdc58f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -587,22 +587,16 @@ class MainActivity : AppCompatActivity() {
                 alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.ok)
                 ) { dialog, _ ->
                     dialog.dismiss()
-                    quitTimer.cancel()
-                    finishAndRemoveTask()
-                    System.exit(0)
+                    //quitTimer.cancel()
+                    //finishAndRemoveTask()
+                    //System.exit(0)
                 }
                 alertDialog.show()
+                return
             } else {
                 quitTimer.cancel()
                 finishAndRemoveTask()
-                if (restart) {
-                    Log.d("Baresip", "Trigger restart")
-                    val restartActivity = Intent(applicationContext, MainActivity::class.java)
-                    val restartIntent = PendingIntent.getActivity(applicationContext,
-                            RESTART_REQUEST_CODE, restartActivity, PendingIntent.FLAG_CANCEL_CURRENT)
-                    val am = applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-                    am.set(AlarmManager.RTC,System.currentTimeMillis() + 1000, restartIntent)
-                }
+                if (restart) reStart()
                 System.exit(0)
                 return
             }
@@ -839,10 +833,14 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    /*override fun onStop() {
-        super.onStop()
-        Log.d("Baresip", "Main stopped")
-    }*/
+    private fun reStart() {
+        Log.d("Baresip", "Trigger restart")
+        val restartActivity = Intent(applicationContext, MainActivity::class.java)
+        val restartIntent = PendingIntent.getActivity(applicationContext,
+                RESTART_REQUEST_CODE, restartActivity, PendingIntent.FLAG_CANCEL_CURRENT)
+        val am = applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        am.set(AlarmManager.RTC,System.currentTimeMillis() + 1000, restartIntent)
+    }
 
     override fun onBackPressed() {
         moveTaskToBack(true)
@@ -937,6 +935,7 @@ class MainActivity : AppCompatActivity() {
                 quitTimer.start()
             } else {
                 finishAndRemoveTask()
+                if (reStart) reStart()
                 System.exit(0)
             }
         }
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 4e8e3917..833f6a98 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -307,10 +307,9 @@
     <string name="messages">Viestit</string>
     <string name="dialpad">Numeronäppäimistö</string>
     <string name="call_already_active">Sinulla on jo puhelu käynnissä.</string>
-    <string name="start_failed">Sovelluksen käynnistäminen
-    epäonnistui. Tämä voi johtua virheellisestä kuunteluosoitteesta tai
-    TLS sertifikaattitiedostosta. Niiden oletusarvot on palautettu. Käynnistä
-    baresip uudelleen.
+    <string name="start_failed">Sovelluksen käynnistäminen epäonnistui. Tämä voi johtua virheellisestä
+        Asetukset arvosta.  Tarkista Kuunteluosoite, TLS-varmennintiedosto ja TLS CA-tiedosto.
+        Sen jälkeen käynnistä baresip uudelleen.
     </string>
     <string name="registering_failed">Tilin \'%1$s\' rekisteröinti epäonnistui.</string>
     <string name="verify">Todenna</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 45a23f27..949d262a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -269,8 +269,8 @@
     <string name="messages">Messages</string>
     <string name="dialpad">Dialpad</string>
     <string name="call_already_active">You already have an active call.</string>
-    <string name="start_failed">Baresip failed to start. This may be due to invalid Listen Address
-        or TLS file. They have been reset. Restart baresip.
+    <string name="start_failed">Baresip failed to start. This may be due to an invalid Settings value.
+        Check Listen Address, TLS Certificate File, and TLS CA File.  Then restart baresip.
     </string>
     <string name="registering_failed">Registering of \`%1$s\` failed.</string>
     <string name="verify">Verify</string>