- use countdown timer to force stop app after 5 seconds and kill after

10 seconds from quit
- removed not needed param from findAorIndex function

app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt

@@ -9,6 +9,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.LinearLayout.LayoutParams
 import android.widget.*
+
 import kotlinx.android.synthetic.main.activity_account.*
 
 class AccountActivity : AppCompatActivity() {
@@ -34,7 +35,7 @@ class AccountActivity : AppCompatActivity() {
 
         acc = Account.find(intent.extras.getString("accp"))!!
         aor = acc.aor
-        uaIndex = UserAgent.findAorIndex(UserAgent.uas(), aor)!!
+        uaIndex = UserAgent.findAorIndex(aor)!!
 
         setTitle(aor.replace("sip:", ""))
 

app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt

@@ -15,10 +15,11 @@ import android.support.v4.app.NotificationCompat
 import android.util.Log
 import android.view.View
 import android.widget.RemoteViews
-import java.io.File
 import android.support.v4.content.LocalBroadcastManager
 import android.os.Build
 import android.support.v4.app.NotificationCompat.VISIBILITY_PRIVATE
+
+import java.io.File
 import java.nio.charset.StandardCharsets
 import java.io.InputStream
 import java.util.*
@@ -38,7 +39,6 @@ class BaresipService: Service() {
 
     internal var rtTimer: Timer? = null
     internal var filesPath = ""
-    internal var restarting = false
 
     override fun onCreate() {
 
@@ -72,7 +72,7 @@ class BaresipService: Service() {
                     if (isConnected) {
                         Log.d(LOG_TAG, "Network is connected/connecting")
                         if (disconnected) {
-                            UserAgent.register(uas)
+                            UserAgent.register()
                             disconnected = false
                         }
                     } else {
@@ -166,13 +166,13 @@ class BaresipService: Service() {
                 updateStatusNotification()
             }
 
-            "Stop" -> {
+            "Stop", "Stop Force" -> {
-                stop()
+                if (action == "Stop") cleanService()
+                if (isServiceRunning) baresipStop(action == "Stop Force")
             }
 
             "Kill" -> {
-                restarting = true
+                stopped()
-                stop()
             }
         }
 
@@ -184,11 +184,11 @@ class BaresipService: Service() {
     }
 
     override fun onDestroy() {
-        Log.d(LOG_TAG, "In onDestroy")
+        Log.d(LOG_TAG, "In onDestroy restart baresip killed by Android")
         super.onDestroy()
-        Log.i(LOG_TAG, "Restart baresip killed by Android")
+        cleanService()
-        restarting = true
+        val broadcastIntent = Intent("com.tutpro.baresip.Restart")
-        stop()
+        sendBroadcast(broadcastIntent)
     }
 
     private fun createNotificationChannels() {
@@ -501,7 +501,7 @@ class BaresipService: Service() {
 
     @Keep
     fun stopped() {
-        Log.d(LOG_TAG, "got event 'stopped'")
+        Log.d(LOG_TAG, "'stopped' from baresip or 'Kill' from MainActivity")
         isServiceRunning = false
         val intent = Intent("service event")
         intent.putExtra("event", "stopped")
@@ -509,7 +509,6 @@ class BaresipService: Service() {
         LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
         stopForeground(true)
         stopSelf()
-        if (restarting) restart()
     }
 
     private fun updateStatusNotification() {
@@ -598,7 +597,7 @@ class BaresipService: Service() {
         }
     }
 
-    private fun stop() {
+    private fun cleanService() {
         uas.clear()
         status.clear()
         history.clear()
@@ -611,17 +610,6 @@ class BaresipService: Service() {
         if (this::nm.isInitialized) nm.cancelAll()
         if (this::wl.isInitialized && wl.isHeld) wl.release()
         if (this::fl.isInitialized && fl.isHeld) fl.release()
-        if (isServiceRunning) {
-            baresipStop(forceStop)
-            if (!forceStop) forceStop = true
-        } else if (restarting)
-            restart()
-    }
-
-    private fun restart() {
-        restarting = false
-        val broadcastIntent = Intent("com.tutpro.baresip.Restart")
-        sendBroadcast(broadcastIntent)
     }
 
     external fun baresipStart(path: String)
@@ -638,7 +626,6 @@ class BaresipService: Service() {
 
         var isServiceRunning = false
         var disconnected = false
-        var forceStop = false
         var libraryLoaded = false
 
         var uas = ArrayList<UserAgent>()

app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt

@@ -14,6 +14,7 @@ import android.view.MenuItem
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.media.*
+import android.os.CountDownTimer
 import android.support.v4.content.LocalBroadcastManager
 import android.support.v7.view.menu.ActionMenuItemView
 import android.view.inputmethod.InputMethodManager
@@ -50,6 +51,8 @@ class MainActivity : AppCompatActivity() {
     internal lateinit var imm: InputMethodManager
     internal lateinit var nm: NotificationManager
     internal lateinit var serviceEventReceiver: BroadcastReceiver
+    internal lateinit var quitTimer: CountDownTimer
+    internal lateinit var stopState: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
 
@@ -96,6 +99,27 @@ class MainActivity : AppCompatActivity() {
         LocalBroadcastManager.getInstance(this).registerReceiver(serviceEventReceiver,
                 IntentFilter("service event"))
 
+        stopState = "initial"
+        quitTimer = object: CountDownTimer(5000, 1000) {
+            override fun onTick(millisUntilFinished: Long) {
+                Log.d("Baresip", "seconds remaining: ${millisUntilFinished/1000}")
+            }
+            override fun onFinish() {
+                when (stopState) {
+                    "initial" -> {
+                        baresipService.setAction("Stop Force");
+                        startService(baresipService)
+                        stopState = "force"
+                        quitTimer.start()
+                    }
+                    "force" -> {
+                        baresipService.setAction("Kill");
+                        startService(baresipService)
+                    }
+                }
+            }
+        }
+
         if (ContextCompat.checkSelfPermission(this,
                         Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
             Log.w("Baresip", "Baresip does not have RECORD_AUDIO permission")
@@ -378,6 +402,7 @@ class MainActivity : AppCompatActivity() {
     private fun handleServiceEvent(event: String, params: ArrayList<String>) {
         if (event == "stopped") {
             Log.d("Baresip", "Handling service event 'stopped'")
+            quitTimer.cancel()
             finishAndRemoveTask()
             System.exit(0)
             return
@@ -814,10 +839,16 @@ class MainActivity : AppCompatActivity() {
                 return true
             }
             R.id.quit -> {
+                if (stopState == "initial") {
                     Log.d("Baresip", "Quiting")
                     if (BaresipService.isServiceRunning) {
                         baresipService.setAction("Stop");
                         startService(baresipService)
+                        quitTimer.start()
+                    } else {
+                        finishAndRemoveTask()
+                        System.exit(0)
+                    }
                 }
                 return true
             }

app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt

@@ -54,15 +54,15 @@ class UserAgent (val uap: String) {
             return null
         }
 
-        fun findAorIndex(uas: ArrayList<UserAgent>, aor: String): Int? {
+        fun findAorIndex(aor: String): Int? {
-            for (i in uas.indices) {
+            for (i in BaresipService.uas.indices) {
-                if (uas[i].account.aor == aor) return i
+                if (BaresipService.uas[i].account.aor == aor) return i
             }
             return null
         }
 
-        fun register(uas: ArrayList<UserAgent>) {
+        fun register() {
-            for (ua in uas) {
+            for (ua in BaresipService.uas) {
                 if (ua.account.regint > 0)
                     if (Api.ua_register(ua.uap) != 0)
                         Log.e("Baresip", "Failed to register ${ua.account.aor}")

app/src/main/res/values/strings.xml

@@ -11,7 +11,7 @@
         - peers of calls and messages can be added to contacts by long clicks\n
         - long clicks can also be used to remove calls, chats, messages, and contacts\n
         - call click when callee has not been given can be used for re-dial\n
-        - quit without network connectivity needs to be forced by selecting it twice\n
+        - quit without network connectivity may take up to 10 seconds\n
     </string>
     <string name="noAccounts">No accounts</string>
     <string name="dispName">Name (if any) used in From URI of outbound requests.</string>