From 92c13cce4f4a265ac6001266817ae4784dbcbfaa Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 23 Jun 2018 14:34:28 +0300
Subject: [PATCH] save history in baresipservice clear global vars at quit

---
 .../kotlin/com/tutpro/baresip/BaresipService.kt    | 14 ++++----------
 .../main/kotlin/com/tutpro/baresip/MainActivity.kt |  4 ----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 9d47224b..67f4f380 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -117,16 +117,6 @@ class BaresipService: Service() {
                 BaresipService.IS_SERVICE_RUNNING = true
                 registerReceiver(nr, IntentFilter("android.net.conn.CONNECTIVITY_CHANGE"))
                 showNotification()
-
-                val handler = Handler()
-                val delay = 1000 * 600L
-                handler.postDelayed(object : Runnable {
-                    override fun run() {
-                        Log.d(LOG_TAG, "Handler based registration")
-                        UserAgent.register(MainActivity.uas)
-                        handler.postDelayed(this, delay)
-                    }
-                }, delay)
             }
 
             "UpdateNotification" -> {
@@ -136,6 +126,10 @@ class BaresipService: Service() {
 
             "Stop" -> {
                 Log.i(LOG_TAG, "Received Stop Foreground Intent")
+                HistoryActivity.saveHistory()
+                MainActivity.uas.clear()
+                MainActivity.images.clear()
+                MainActivity.history.clear()
                 baresipStop()
                 BaresipService.IS_SERVICE_RUNNING = false
                 unregisterReceiver(nr)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index e4267e69..1a60261d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -505,7 +505,6 @@ class MainActivity : AppCompatActivity() {
                                 }
                                 historyButton.visibility = View.VISIBLE
                             }
-                            // nm.cancel(INCOMING_ID)
                             if (!call.hasHistory) {
                                 if (History.aorHistory(history, aor) > HISTORY_SIZE)
                                     History.aorRemoveHistory(history, aor)
@@ -557,7 +556,6 @@ class MainActivity : AppCompatActivity() {
         Log.d("Baresip", "Resumed")
         imm.hideSoftInputFromWindow(callee.windowToken, 0)
         visible = true
-        // nm.cancel(INCOMING_ID)
     }
 
     override fun onBackPressed() {
@@ -613,11 +611,9 @@ class MainActivity : AppCompatActivity() {
             R.id.quit -> {
                 Log.d("Baresip", "Quiting")
                 if (BaresipService.IS_SERVICE_RUNNING) {
-                    HistoryActivity.saveHistory()
                     baresipService.setAction("Stop");
                     startService(baresipService)
                 }
-                // nm.cancelAll()
                 finish()
                 // System.exit(0)
                 return true