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

Restore chat list position when returning from chat

Browse Source
This commit is contained in:
Juha Heinanen
2021-06-06 18:31:08 +03:00
parent d1a688482d
commit 4dcf00a76f
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
View File

@ -3,15 +3,14 @@ package com.tutpro.baresip
import android.app.Activity import android.app.Activity
import android.content.* import android.content.*
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.widget.* import android.widget.*
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import com.tutpro.baresip.databinding.ActivityChatsBinding import com.tutpro.baresip.databinding.ActivityChatsBinding
import java.util.* import java.util.*
class ChatsActivity: AppCompatActivity() { class ChatsActivity: AppCompatActivity() {
@ -23,6 +22,7 @@ class ChatsActivity: AppCompatActivity() {
internal lateinit var peerUri: AutoCompleteTextView internal lateinit var peerUri: AutoCompleteTextView
internal lateinit var plusButton: ImageButton internal lateinit var plusButton: ImageButton
internal lateinit var aor: String internal lateinit var aor: String
private var scrollPosition = -1
public override fun onCreate(savedInstanceState: Bundle?) { public override fun onCreate(savedInstanceState: Bundle?) {
@ -56,6 +56,7 @@ class ChatsActivity: AppCompatActivity() {
} }
listView.onItemClickListener = AdapterView.OnItemClickListener { _, _, pos, _ -> listView.onItemClickListener = AdapterView.OnItemClickListener { _, _, pos, _ ->
scrollPosition = pos
val i = Intent(this, ChatActivity::class.java) val i = Intent(this, ChatActivity::class.java)
val b = Bundle() val b = Bundle()
b.putString("aor", aor) b.putString("aor", aor)
@ -148,12 +149,25 @@ class ChatsActivity: AppCompatActivity() {
} }
override fun onPause() {
MainActivity.activityAor = aor
super.onPause()
}
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
clAdapter.clear() clAdapter.clear()
uaMessages = uaMessages(aor) uaMessages = uaMessages(aor)
clAdapter = ChatListAdapter(this, uaMessages) clAdapter = ChatListAdapter(this, uaMessages)
listView.adapter = clAdapter listView.adapter = clAdapter
if (uaMessages.count() > 0) {
if (scrollPosition >= 0) {
listView.setSelection(scrollPosition)
scrollPosition = -1
} else {
listView.setSelection(0)
}
}
} }
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
@ -203,11 +217,6 @@ class ChatsActivity: AppCompatActivity() {
returnResult() returnResult()
} }
override fun onPause() {
MainActivity.activityAor = aor
super.onPause()
}
private fun returnResult() { private fun returnResult() {
val i = Intent() val i = Intent()
setResult(Activity.RESULT_CANCELED, i) setResult(Activity.RESULT_CANCELED, i)