From b5aa561a9299e2f38245ea765606de0ee3967f55 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 6 Apr 2020 10:13:25 +0200
Subject: [PATCH] renaming contactId to id

---
 .../smsmessenger/activities/NewMessageActivity.kt      | 10 +++++-----
 .../simplemobiletools/smsmessenger/models/Contact.kt   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewMessageActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewMessageActivity.kt
index c741b25c..fc7e0f2c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewMessageActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewMessageActivity.kt
@@ -43,8 +43,8 @@ class NewMessageActivity : SimpleActivity() {
         val names = getNames()
         contacts = getPhoneNumbers()
         contacts.forEach {
-            val contactId = it.contactId
-            val contact = names.firstOrNull { it.contactId == contactId }
+            val contactId = it.id
+            val contact = names.firstOrNull { it.id == contactId }
             val name = contact?.name
             if (name != null) {
                 it.name = name
@@ -73,7 +73,7 @@ class NewMessageActivity : SimpleActivity() {
 
     private fun addSelectedContact(contact: Contact) {
         new_message_to.setText("")
-        if (selectedContacts.map { it.contactId }.contains(contact.contactId)) {
+        if (selectedContacts.map { it.id }.contains(contact.id)) {
             return
         }
 
@@ -91,7 +91,7 @@ class NewMessageActivity : SimpleActivity() {
             layoutInflater.inflate(R.layout.item_selected_contact, null).apply {
                 selected_contact_name.text = contact.name
                 selected_contact_remove.setOnClickListener {
-                    removeSelectedContact(contact.contactId)
+                    removeSelectedContact(contact.id)
                 }
                 views.add(this)
             }
@@ -147,7 +147,7 @@ class NewMessageActivity : SimpleActivity() {
     }
 
     private fun removeSelectedContact(id: Int) {
-        selectedContacts = selectedContacts.filter { it.contactId != id }.toMutableList() as ArrayList<Contact>
+        selectedContacts = selectedContacts.filter { it.id != id }.toMutableList() as ArrayList<Contact>
         showSelectedContacts()
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Contact.kt
index b58967c0..3da2aa22 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Contact.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Contact.kt
@@ -9,7 +9,7 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestOptions
 
 data class Contact(
-    val contactId: Int,
+    val id: Int,
     var name: String,
     var photoUri: String,
     var phoneNumber: String