Fixed crash when selecting an account in accounts activity
This commit is contained in:
@@ -49,7 +49,7 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
|
|||||||
val b = Bundle()
|
val b = Bundle()
|
||||||
b.putString("aor", UserAgent.uas()[position].account.aor)
|
b.putString("aor", UserAgent.uas()[position].account.aor)
|
||||||
i.putExtras(b)
|
i.putExtras(b)
|
||||||
(cxt as MainActivity).accountRequest.launch(i)
|
MainActivity.accountRequest!!.launch(i)
|
||||||
}
|
}
|
||||||
|
|
||||||
viewHolder.actionView.setOnClickListener {
|
viewHolder.actionView.setOnClickListener {
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ class MainActivity : AppCompatActivity() {
|
|||||||
private lateinit var swipeRefresh: SwipeRefreshLayout
|
private lateinit var swipeRefresh: SwipeRefreshLayout
|
||||||
|
|
||||||
private lateinit var accountsRequest: ActivityResultLauncher<Intent>
|
private lateinit var accountsRequest: ActivityResultLauncher<Intent>
|
||||||
lateinit var accountRequest: ActivityResultLauncher<Intent>
|
|
||||||
private lateinit var chatRequests: ActivityResultLauncher<Intent>
|
private lateinit var chatRequests: ActivityResultLauncher<Intent>
|
||||||
private lateinit var configRequest: ActivityResultLauncher<Intent>
|
private lateinit var configRequest: ActivityResultLauncher<Intent>
|
||||||
private lateinit var backupRequest: ActivityResultLauncher<Intent>
|
private lateinit var backupRequest: ActivityResultLauncher<Intent>
|
||||||
@@ -226,7 +225,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
val b = Bundle()
|
val b = Bundle()
|
||||||
b.putString("aor", aorSpinner.tag.toString())
|
b.putString("aor", aorSpinner.tag.toString())
|
||||||
i.putExtras(b)
|
i.putExtras(b)
|
||||||
accountRequest.launch(i)
|
accountRequest!!.launch(i)
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
UserAgent.uas()[aorSpinner.selectedItemPosition].account.resumeUri =
|
UserAgent.uas()[aorSpinner.selectedItemPosition].account.resumeUri =
|
||||||
@@ -1840,6 +1839,8 @@ class MainActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
|
var accountRequest: ActivityResultLauncher<Intent>? = null
|
||||||
|
|
||||||
var visible = false
|
var visible = false
|
||||||
var activityAor = ""
|
var activityAor = ""
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user