AndroidContact, AndroidGroup: add _contact to toString; Contact: add …

…hashCode()
bitfireAT · Jul 15, 2024 · 5b3b8ef · 5b3b8ef
1 parent 3f3bfc0
commit 5b3b8ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/src/main/java/at/bitfire/vcard4android/AndroidContact.kt b/lib/src/main/java/at/bitfire/vcard4android/AndroidContact.kt
@@ -19,7 +19,7 @@ import at.bitfire.vcard4android.contactrow.PhotoBuilder
 import java.io.FileNotFoundException
 
 open class AndroidContact(
-        open val addressBook: AndroidAddressBook<out AndroidContact, out AndroidGroup>
+    open val addressBook: AndroidAddressBook<out AndroidContact, out AndroidGroup>
 ) {
 
     companion object {
@@ -213,8 +213,7 @@ open class AndroidContact(
 
     protected fun dataSyncURI() = addressBook.syncAdapterURI(ContactsContract.Data.CONTENT_URI)
 
-    override fun toString(): String {
-        return "AndroidContact(id=$id, fileName=$fileName, eTag=$eTag)"
-    }
+    override fun toString() =
+        "AndroidContact(id=$id, fileName=$fileName, eTag=$eTag, _contact=$_contact)"
 
 }
diff --git a/lib/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt b/lib/src/main/java/at/bitfire/vcard4android/AndroidGroup.kt
@@ -17,7 +17,7 @@ import androidx.annotation.CallSuper
 import java.io.FileNotFoundException
 
 open class AndroidGroup(
-        val addressBook: AndroidAddressBook<out AndroidContact, out AndroidGroup>
+    val addressBook: AndroidAddressBook<out AndroidContact, out AndroidGroup>
 ) {
 
     companion object {
@@ -163,8 +163,7 @@ open class AndroidGroup(
         return addressBook.syncAdapterURI(ContentUris.withAppendedId(Groups.CONTENT_URI, id))
     }
 
-    override fun toString(): String {
-        return "AndroidGroup(id=$id, fileName=$fileName, eTag=$eTag)"
-    }
+    override fun toString() =
+        "AndroidGroup(id=$id, fileName=$fileName, eTag=$eTag, _contact=$_contact)"
 
 }
diff --git a/lib/src/main/java/at/bitfire/vcard4android/Contact.kt b/lib/src/main/java/at/bitfire/vcard4android/Contact.kt
@@ -146,6 +146,8 @@ data class Contact(
         else
             false
 
+    override fun hashCode() = compareFields().contentHashCode()
+
 
     interface Downloader {
         fun download(url: String, accepts: String): ByteArray?
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,6 +146,8 @@ data class Contact( @@
             else
                 false
+        override fun hashCode() = compareFields().contentHashCode()
         interface Downloader {
             fun download(url: String, accepts: String): ByteArray?
@@ Expand Down @@