From 1beff39220588277fafc51e154d1be7ed4044bfd Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 27 Mar 2021 10:25:55 +0200
Subject: [PATCH] Chat, call history, and contact related bug fixes

---
 app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt | 3 +--
 app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt   | 8 ++++++++
 app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt | 5 ++---
 app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt | 3 +--
 .../main/kotlin/com/tutpro/baresip/ContactListAdapter.kt  | 3 +--
 .../main/kotlin/com/tutpro/baresip/ContactsActivity.kt    | 7 +++++++
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt
index a3277511..5ae0aa27 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt
@@ -1,7 +1,6 @@
 package com.tutpro.baresip
 
 import android.content.Context
-import android.graphics.drawable.GradientDrawable
 import androidx.cardview.widget.CardView
 import android.view.LayoutInflater
 import android.view.View
@@ -33,7 +32,7 @@ class CallListAdapter(private val cxt: Context, private val rows: ArrayList<Call
             } else {
                 textAvatarView.visibility = View.VISIBLE
                 cardAvatarView.visibility = View.GONE
-                (textAvatarView.background as GradientDrawable).setColor(contact.color)
+                textAvatarView.background.setTint(contact.color)
                 textAvatarView.text = "${contact.name[0]}"
             }
         } else {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
index 44d0e6f6..464f2628 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
@@ -140,6 +140,14 @@ class CallsActivity : AppCompatActivity() {
         invalidateOptionsMenu()
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+
+        super.onActivityResult(requestCode, resultCode, data)
+
+        if (resultCode == RESULT_OK) clAdapter.notifyDataSetChanged()
+
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
 
         if (BaresipService.activities.indexOf("calls,$aor") == -1)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt
index d5c7fae6..822ba481 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt
@@ -2,7 +2,6 @@ package com.tutpro.baresip
 
 import android.content.Context
 import android.graphics.Typeface
-import android.graphics.drawable.GradientDrawable
 import androidx.core.content.ContextCompat
 import androidx.cardview.widget.CardView
 import android.text.format.DateUtils.isToday
@@ -14,7 +13,7 @@ import android.widget.*
 import java.util.*
 import java.text.DateFormat
 
-class ChatListAdapter(private val ctx: Context, private var rows: ArrayList<Message>) :
+class ChatListAdapter(private val ctx: Context, private val rows: ArrayList<Message>) :
         ArrayAdapter<Message>(ctx, R.layout.message, rows) {
 
     private val layoutInflater = LayoutInflater.from(context)
@@ -57,7 +56,7 @@ class ChatListAdapter(private val ctx: Context, private var rows: ArrayList<Mess
             } else {
                 viewHolder.textAvatarView.visibility = View.VISIBLE
                 viewHolder.cardAvatarView.visibility = View.GONE
-                (viewHolder.textAvatarView.background as GradientDrawable).setColor(contact.color)
+                viewHolder.textAvatarView.background.setTint(contact.color)
                 viewHolder.textAvatarView.text = "${peer[0]}"
             }
         } else {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
index b9a69d03..5b647095 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
@@ -12,7 +12,6 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Matrix
 import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.provider.ContactsContract
 import android.provider.ContactsContract.CommonDataKinds
@@ -337,7 +336,7 @@ class ContactActivity : AppCompatActivity() {
     private fun showTextAvatar(name: String, color: Int) {
         textAvatarView.visibility = View.VISIBLE
         cardAvatarView.visibility = View.GONE
-        (textAvatarView.background as GradientDrawable).setColor(color)
+        textAvatarView.background.setTint(color)
         textAvatarView.text = "${name[0]}"
     }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
index 0b1a2f46..b24d71fc 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
@@ -5,7 +5,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
-import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.os.SystemClock
 import androidx.appcompat.app.AlertDialog
@@ -63,7 +62,7 @@ class ContactListAdapter(private val ctx: Context, private val rows: ArrayList<C
             viewHolder.textAvatarView.visibility = View.VISIBLE
             viewHolder.cardAvatarView.visibility = View.GONE
             viewHolder.imageAvatarView.visibility = View.GONE
-            (viewHolder.textAvatarView.background as GradientDrawable).setColor(contact.color)
+            viewHolder.textAvatarView.background.setTint(contact.color)
             if (contact.name.isNotEmpty())
                 viewHolder.textAvatarView.text = "${contact.name[0]}"
             else
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt
index 4e9d4a7e..1231e48d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt
@@ -50,6 +50,13 @@ class ContactsActivity : AppCompatActivity() {
 
     }
 
+    override fun onResume() {
+
+        super.onResume()
+
+        clAdapter.notifyDataSetChanged()
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
 
         super.onActivityResult(requestCode, resultCode, data)