From 7d943362c65391b7b7a25497b3ed97dfe35416cf Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Fri, 18 Feb 2022 10:11:22 +0200
Subject: [PATCH] Minor code cleanup

---
 app/src/main/kotlin/com/tutpro/baresip/Contact.kt    |  4 ++--
 .../kotlin/com/tutpro/baresip/ContactActivity.kt     | 12 ------------
 .../kotlin/com/tutpro/baresip/ContactListAdapter.kt  | 10 +++++++++-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
index e5506a76..b8276334 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
@@ -208,14 +208,14 @@ sealed class Contact {
             BaresipService.contactUpdate.postValue(System.nanoTime())
         }
 
-        fun sortContacts() {
+        private fun sortContacts() {
             BaresipService.contacts.sortBy{ when (it) {
                 is BaresipContact -> it.name
                 is AndroidContact -> it.name
             }}
         }
 
-        fun generateContactNames () {
+        private fun generateContactNames () {
             BaresipService.contactNames.clear()
             BaresipService.contactNames.addAll(
                     BaresipService.contacts.map {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
index ff32bfe3..d0d059ad 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
@@ -494,16 +494,4 @@ class ContactActivity : AppCompatActivity() {
         }
     }
 
-    companion object {
-
-        var contact: Contact? = null
-
-        fun deleteAndroidContact(ctx: Context, name: String): Int {
-            return ctx.contentResolver.delete(ContactsContract.RawContacts.CONTENT_URI,
-                    ContactsContract.Contacts.DISPLAY_NAME + "='" + name + "'",
-                    null)
-        }
-
-    }
-
 }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
index 3c5da769..eddda799 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
@@ -6,6 +6,7 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.os.SystemClock
+import android.provider.ContactsContract
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -176,7 +177,7 @@ class ContactListAdapter(private val ctx: Context, private val rows: ArrayList<C
                                 this.notifyDataSetChanged()
                             }
                             is Contact.AndroidContact -> {
-                                ContactActivity.deleteAndroidContact(ctx, contact.name)
+                                deleteAndroidContact(ctx, contact.name)
                             }
                         }
                     }
@@ -202,4 +203,11 @@ class ContactListAdapter(private val ctx: Context, private val rows: ArrayList<C
 
         return rowView
     }
+
+    private fun deleteAndroidContact(ctx: Context, name: String): Int {
+        return ctx.contentResolver.delete(ContactsContract.RawContacts.CONTENT_URI,
+                ContactsContract.Contacts.DISPLAY_NAME + "='" + name + "'",
+                null)
+    }
+
 }