jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unregister serviceEventReceiver when activity is destroyed

Browse Source
This commit is contained in:
Juha Heinanen
2021-01-12 09:16:27 +02:00
parent bbbd74de6f
commit 43f1bfdd05
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+18 -5
View File
@@ -57,7 +57,7 @@ class MainActivity : AppCompatActivity() {
private lateinit var serviceEventReceiver: BroadcastReceiver private lateinit var serviceEventReceiver: BroadcastReceiver
private lateinit var quitTimer: CountDownTimer private lateinit var quitTimer: CountDownTimer
private lateinit var stopState: String private lateinit var stopState: String
private lateinit var speakerIcon: MenuItem private var speakerIcon: MenuItem? = null
private lateinit var swipeRefresh: SwipeRefreshLayout private lateinit var swipeRefresh: SwipeRefreshLayout
private lateinit var baresipService: Intent private lateinit var baresipService: Intent
@@ -68,8 +68,10 @@ class MainActivity : AppCompatActivity() {
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
if (Preferences(applicationContext).displayTheme != AppCompatDelegate.getDefaultNightMode()) if (Preferences(applicationContext).displayTheme != AppCompatDelegate.getDefaultNightMode()) {
AppCompatDelegate.setDefaultNightMode(Preferences(applicationContext).displayTheme) AppCompatDelegate.setDefaultNightMode(Preferences(applicationContext).displayTheme)
delegate.applyDayNight()
}
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater) binding = ActivityMainBinding.inflate(layoutInflater)
@@ -568,6 +570,11 @@ class MainActivity : AppCompatActivity() {
} }
} }
override fun onStart() {
Log.d("Baresip", "Main onStart")
super.onStart()
}
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
Log.d("Baresip", "Main onResume with action '$resumeAction'") Log.d("Baresip", "Main onResume with action '$resumeAction'")
@@ -630,6 +637,11 @@ class MainActivity : AppCompatActivity() {
super.onPause() super.onPause()
} }
override fun onStop() {
Log.d("Baresip", "Main onStop")
super.onStop()
}
override fun recreate() { override fun recreate() {
Log.d("Baresip", "Main onCreate") Log.d("Baresip", "Main onCreate")
super.recreate() super.recreate()
@@ -861,7 +873,7 @@ class MainActivity : AppCompatActivity() {
if (acc.missedCalls) if (acc.missedCalls)
callsButton.setImageResource(R.drawable.calls_missed) 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 volumeControlStream = AudioManager.STREAM_MUSIC
val param = ev[1].trim() val param = ev[1].trim()
if ((param != "") && (Call.uaCalls(ua, "").size == 0)) { if ((param != "") && (Call.uaCalls(ua, "").size == 0)) {
@@ -928,6 +940,7 @@ class MainActivity : AppCompatActivity() {
override fun onDestroy() { override fun onDestroy() {
Log.d("Baresip", "Main onDestroy") Log.d("Baresip", "Main onDestroy")
LocalBroadcastManager.getInstance(this).unregisterReceiver(serviceEventReceiver)
BaresipService.activities.clear() BaresipService.activities.clear()
super.onDestroy() super.onDestroy()
} }
@@ -937,9 +950,9 @@ class MainActivity : AppCompatActivity() {
menuInflater.inflate(R.menu.speaker_icon, menu) menuInflater.inflate(R.menu.speaker_icon, menu)
speakerIcon = menu.findItem(R.id.speakerIcon) speakerIcon = menu.findItem(R.id.speakerIcon)
if (am.isSpeakerphoneOn) if (am.isSpeakerphoneOn)
speakerIcon.setIcon(R.drawable.speaker_on) speakerIcon!!.setIcon(R.drawable.speaker_on)
else else
speakerIcon.setIcon(R.drawable.speaker_off) speakerIcon!!.setIcon(R.drawable.speaker_off)
return super.onCreateOptionsMenu(menu) return super.onCreateOptionsMenu(menu)
} }