From f41dabbc0e20abd2dc675c2d1ee803599eb668a1 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Thu, 8 Jul 2021 17:31:17 +0300
Subject: [PATCH] Fixed crash when selecting an account in accounts activity

---
 app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
index 3bcac956..084d000d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
@@ -49,7 +49,7 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
             val b = Bundle()
             b.putString("aor", UserAgent.uas()[position].account.aor)
             i.putExtras(b)
-            (cxt as MainActivity).accountRequest.launch(i)
+            MainActivity.accountRequest!!.launch(i)
         }
 
         viewHolder.actionView.setOnClickListener {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 11e8a077..31934130 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -70,7 +70,6 @@ class MainActivity : AppCompatActivity() {
     private lateinit var swipeRefresh: SwipeRefreshLayout
 
     private lateinit var accountsRequest: ActivityResultLauncher<Intent>
-    lateinit var accountRequest: ActivityResultLauncher<Intent>
     private lateinit var chatRequests: ActivityResultLauncher<Intent>
     private lateinit var configRequest: ActivityResultLauncher<Intent>
     private lateinit var backupRequest: ActivityResultLauncher<Intent>
@@ -226,7 +225,7 @@ class MainActivity : AppCompatActivity() {
                         val b = Bundle()
                         b.putString("aor", aorSpinner.tag.toString())
                         i.putExtras(b)
-                        accountRequest.launch(i)
+                        accountRequest!!.launch(i)
                         true
                     } else {
                         UserAgent.uas()[aorSpinner.selectedItemPosition].account.resumeUri =
@@ -1840,6 +1839,8 @@ class MainActivity : AppCompatActivity() {
 
     companion object {
 
+        var accountRequest: ActivityResultLauncher<Intent>? = null
+
         var visible = false
         var activityAor = ""