From cebbd237f3f3423878bdd59a0073452053d02c35 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 21 Apr 2020 18:08:21 +0300
Subject: [PATCH] - Fixed restart on Android 10.

---
 .../tutpro/baresip/BootCompletedReceiver.kt   |  2 +-
 .../kotlin/com/tutpro/baresip/MainActivity.kt | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt b/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt
index 24d8142a..53e4cac7 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt
@@ -17,7 +17,7 @@ class BootCompletedReceiver : BroadcastReceiver() {
             val config = String(Utils.getFileContents(configPath)!!, StandardCharsets.ISO_8859_1)
             val asCv = Utils.getNameValue(config,"auto_start")
             if ((asCv.size > 0) && (asCv[0] == "yes")) {
-                Log.d("Baresip", "Start baresip upon boot completed or restart")
+                Log.i("Baresip", "Start baresip upon boot completed or restart")
                 val i = Intent(context, MainActivity::class.java)
                 i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 val b = Bundle()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 90ef4e1f..da2a58e7 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -598,14 +598,15 @@ class MainActivity : AppCompatActivity() {
                     //System.exit(0)
                 }
                 alertDialog.show()
-                return
             } else {
                 quitTimer.cancel()
                 finishAndRemoveTask()
-                if (restart) reStart()
-                System.exit(0)
-                return
+                if (restart)
+                    reStart()
+                else
+                    System.exit(0)
             }
+            return
         }
         val uap = params[0]
         val ua = UserAgent.find(uap)
@@ -841,11 +842,11 @@ class MainActivity : AppCompatActivity() {
 
     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)
+        val pm = applicationContext.packageManager
+        val intent = pm.getLaunchIntentForPackage(this.getPackageName())
+        this.finishAffinity()
+        this.startActivity(intent)
+        System.exit(0)
     }
 
     override fun onBackPressed() {
@@ -944,8 +945,10 @@ class MainActivity : AppCompatActivity() {
                 quitTimer.start()
             } else {
                 finishAndRemoveTask()
-                if (reStart) reStart()
-                System.exit(0)
+                if (reStart)
+                    reStart()
+                else
+                    System.exit(0)
             }
         }
     }