From f361260361a6006149d9366479f64b64bb5937fe Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 2 Oct 2019 17:04:04 +0300 Subject: [PATCH] - When new chat message arrives, do not add chat to activity to stack if it already is there. --- app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt | 3 ++- app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt index 7ee31c45..9d70c4a2 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt @@ -49,7 +49,8 @@ class ChatActivity : AppCompatActivity() { ua = userAgent } - BaresipService.activities.add(0, "chat,$aor,$peerUri,$focus") + if (!BaresipService.activities.first().startsWith("chat,$aor,$peerUri")) + BaresipService.activities.add(0, "chat,$aor,$peerUri,$focus") imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager this@ChatActivity.window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index f50fec97..0796aa13 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -822,6 +822,7 @@ class MainActivity : AppCompatActivity() { "message show", "message reply" -> { val peer = params[1] Log.d("Baresip", "Message for $aor from $peer") + Log.d("Baresip", "Activity stack ${BaresipService.activities.toString()}") if ((aorSpinner.selectedItemPosition == -1) || (ua != UserAgent.uas()[aorSpinner.selectedItemPosition])) aorSpinner.setSelection(account_index)