From 43f1bfdd05ffcb12df535e8821211b347a5be652 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 12 Jan 2021 09:16:27 +0200
Subject: [PATCH] Unregister serviceEventReceiver when activity is destroyed

---
 .../kotlin/com/tutpro/baresip/MainActivity.kt | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index affa833d..e5dc9658 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -57,7 +57,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var serviceEventReceiver: BroadcastReceiver
     private lateinit var quitTimer: CountDownTimer
     private lateinit var stopState: String
-    private lateinit var speakerIcon: MenuItem
+    private var speakerIcon: MenuItem? = null
     private lateinit var swipeRefresh: SwipeRefreshLayout
 
     private lateinit var baresipService: Intent
@@ -68,8 +68,10 @@ class MainActivity : AppCompatActivity() {
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
 
-        if (Preferences(applicationContext).displayTheme != AppCompatDelegate.getDefaultNightMode())
+        if (Preferences(applicationContext).displayTheme != AppCompatDelegate.getDefaultNightMode()) {
             AppCompatDelegate.setDefaultNightMode(Preferences(applicationContext).displayTheme)
+            delegate.applyDayNight()
+        }
 
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
@@ -568,6 +570,11 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onStart() {
+        Log.d("Baresip", "Main onStart")
+        super.onStart()
+    }
+
     override fun onResume() {
         super.onResume()
         Log.d("Baresip", "Main onResume with action '$resumeAction'")
@@ -630,6 +637,11 @@ class MainActivity : AppCompatActivity() {
         super.onPause()
     }
 
+    override fun onStop() {
+        Log.d("Baresip", "Main onStop")
+        super.onStop()
+    }
+
     override fun recreate() {
         Log.d("Baresip", "Main onCreate")
         super.recreate()
@@ -861,7 +873,7 @@ class MainActivity : AppCompatActivity() {
                             if (acc.missedCalls)
                                 callsButton.setImageResource(R.drawable.calls_missed)
                         }
-                        speakerIcon.setIcon(R.drawable.speaker_off)
+                        if (speakerIcon != null) speakerIcon!!.setIcon(R.drawable.speaker_off)
                         volumeControlStream = AudioManager.STREAM_MUSIC
                         val param = ev[1].trim()
                         if ((param != "") && (Call.uaCalls(ua, "").size == 0)) {
@@ -928,6 +940,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         Log.d("Baresip", "Main onDestroy")
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(serviceEventReceiver)
         BaresipService.activities.clear()
         super.onDestroy()
     }
@@ -937,9 +950,9 @@ class MainActivity : AppCompatActivity() {
         menuInflater.inflate(R.menu.speaker_icon, menu)
         speakerIcon = menu.findItem(R.id.speakerIcon)
         if (am.isSpeakerphoneOn)
-            speakerIcon.setIcon(R.drawable.speaker_on)
+            speakerIcon!!.setIcon(R.drawable.speaker_on)
         else
-            speakerIcon.setIcon(R.drawable.speaker_off)
+            speakerIcon!!.setIcon(R.drawable.speaker_off)
         return super.onCreateOptionsMenu(menu)
     }