From 0f4ae4ff8bf7693c905630bbbf94bd7a3e6ab13a Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 17 Mar 2018 17:21:32 +1300
Subject: [PATCH] improved showing of history items

---
 .../kotlin/com/tutpro/baresip/HistoryActivity.kt  | 15 +++++++++------
 .../kotlin/com/tutpro/baresip/MainActivity.kt     | 12 ++++++------
 app/src/main/kotlin/com/tutpro/baresip/Utils.kt   | 12 +++++++++++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/HistoryActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/HistoryActivity.kt
index 29d2f6dd..2d2d322a 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/HistoryActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/HistoryActivity.kt
@@ -35,9 +35,8 @@ class HistoryActivity : AppCompatActivity() {
         val adapter = HistoryListAdapter(this, uaHistory)
         listview.adapter = adapter
         listview.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ ->
-            val row = uaHistory[position]
             val i = Intent()
-            i.putExtra("peer_uri", row.peerURI)
+            i.putExtra("peer_uri", uaHistory[position].peerURI)
             setResult(Activity.RESULT_OK, i)
             finish()
         }
@@ -89,6 +88,10 @@ class HistoryActivity : AppCompatActivity() {
         for (i in History.indices.reversed()) {
             val h = History[i]
             if (h.aor == aor) {
+                var peer_uri = h.peerURI
+                if (Utils.uriHostPart(peer_uri) == Utils.uriHostPart(aor)) {
+                    peer_uri = Utils.uriUserPart(peer_uri)
+                }
                 val time: String
                 if (isToday(h.time)) {
                     val fmt = SimpleDateFormat("HH:mm")
@@ -99,15 +102,15 @@ class HistoryActivity : AppCompatActivity() {
                 }
                 if (h.direction == "in") {
                     if (h.connected) {
-                        uaHistory.add(HistoryRow(h.peerURI, R.drawable.arrow_down_green, time))
+                        uaHistory.add(HistoryRow(peer_uri, R.drawable.arrow_down_green, time))
                     } else {
-                        uaHistory.add(HistoryRow(h.peerURI, R.drawable.arrow_down_red, time))
+                        uaHistory.add(HistoryRow(peer_uri, R.drawable.arrow_down_red, time))
                     }
                 } else {
                     if (h.connected) {
-                        uaHistory.add(HistoryRow(h.peerURI, R.drawable.arrow_up_green, time))
+                        uaHistory.add(HistoryRow(peer_uri, R.drawable.arrow_up_green, time))
                     } else {
-                        uaHistory.add(HistoryRow(h.peerURI, R.drawable.arrow_up_red, time))
+                        uaHistory.add(HistoryRow(peer_uri, R.drawable.arrow_up_red, time))
                     }
                 }
                 posAtHistory.add(i)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 752b93b9..2e61685c 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -650,12 +650,12 @@ class MainActivity : AppCompatActivity() {
         internal var In = ArrayList<Call>()
         internal var Out = ArrayList<Call>()
 
-        private val RECORD_AUDIO_PERMISSION = 1
-        private val EDIT_ACCOUNTS_CODE = 1
-        private val EDIT_CONTACTS_CODE = 2
-        private val EDIT_CONFIG_CODE = 3
-        private val HISTORY_CODE = 4
-        private val ABOUT_CODE = 5
+        const val RECORD_AUDIO_PERMISSION = 1
+        const val EDIT_ACCOUNTS_CODE = 1
+        const val EDIT_CONTACTS_CODE = 2
+        const val EDIT_CONFIG_CODE = 3
+        const val HISTORY_CODE = 4
+        const val ABOUT_CODE = 5
 
         external fun contacts_remove()
         external fun contact_add(contact: String)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index ac373c83..3c39aeda 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -1,7 +1,6 @@
 package com.tutpro.baresip
 
 import android.content.Context
-import android.content.DialogInterface
 import android.support.v7.app.AlertDialog
 import android.util.Log
 
@@ -64,4 +63,15 @@ object Utils {
         alertDialog.show()
     }
 
+    fun uriHostPart(uri: String): String {
+        return uri.substringAfter("@")
+                .substringBefore(":")
+                .substringBefore(";")
+                .substringBefore(">")
+    }
+
+    fun uriUserPart(uri: String): String {
+        return uri.substringAfter(":").substringBefore("@")
+    }
+
 }