expo-contacts 14.0.4 → 14.0.5

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 14.0.5 — 2025-01-31
+
+### 🐛 Bug fixes
+
+- [Android] Fixed saving a contact with photos on Android. ([#34432](https://github.com/expo/expo/pull/34432) by [@chrfalch](https://github.com/chrfalch))
+- Fixed corrupted contact after `updateContactAsync`. ([#34186](https://github.com/expo/expo/pull/34186) by [@freeboub](https://github.com/34186))
+
 ## 14.0.4 — 2025-01-27
 
 ### 🎉 New features

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '14.0.4'
+version = '14.0.5'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.contacts"
   defaultConfig {
     versionCode 29
-    versionName "14.0.4"
+    versionName "14.0.5"
   }
 }
 

package/android/src/main/java/expo/modules/contacts/Contact.kt

@@ -22,6 +22,8 @@ import expo.modules.contacts.models.PhoneNumberModel
 import expo.modules.contacts.models.PostalAddressModel
 import expo.modules.contacts.models.RelationshipModel
 import expo.modules.contacts.models.UrlAddressModel
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.exception.Exceptions
 import java.io.ByteArrayOutputStream
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -29,7 +31,7 @@ import java.util.Calendar
 import java.util.Locale
 
 // TODO: MaidenName Nickname
-class Contact(var contactId: String) {
+class Contact(var contactId: String, var appContext: AppContext) {
   private var rawContactId: String? = null
   var lookupKey: String? = null
   private var displayName: String? = null
@@ -285,17 +287,42 @@ class Contact(var contactId: String) {
           .build()
       )
     }
+
+    // Flush all data from linked db
+    rawContactId?.let { id ->
+      baseModelsContentType.forEach {
+        ops.add(getFlushOperation(it, id))
+      }
+    }
+
+    // add updated data
     for (map in baseModels) {
       for (item in map) {
-        ops.add(item.getDeleteOperation(rawContactId!!))
         ops.add(item.getInsertOperation(rawContactId))
       }
     }
     return ops
   }
 
+  private fun getFlushOperation(contentType: String, rawId: String): ContentProviderOperation {
+    return ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
+      .withSelection("${ContactsContract.Data.MIMETYPE}=? AND ${ContactsContract.Data.RAW_CONTACT_ID}=?", arrayOf(contentType, rawId))
+      .build()
+  }
+
   private val baseModels: Array<List<BaseModel>>
     get() = arrayOf(dates, emails, imAddresses, phones, addresses, relationships, urlAddresses, extraNames)
+  private val baseModelsContentType: Array<String>
+    get() = arrayOf(
+      CommonDataKinds.Event.CONTENT_ITEM_TYPE,
+      CommonDataKinds.Email.CONTENT_ITEM_TYPE,
+      CommonDataKinds.Im.CONTENT_ITEM_TYPE,
+      CommonDataKinds.Phone.CONTENT_ITEM_TYPE,
+      CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE,
+      CommonDataKinds.Relation.CONTENT_ITEM_TYPE,
+      CommonDataKinds.Website.CONTENT_ITEM_TYPE,
+      CommonDataKinds.Nickname.CONTENT_ITEM_TYPE
+    )
 
   // convert to react native object
   @Throws(ParseException::class)
@@ -521,7 +548,10 @@ class Contact(var contactId: String) {
     }
 
   private fun getThumbnailBitmap(photoUri: String?): Bitmap {
-    val path = Uri.parse(photoUri).path
-    return BitmapFactory.decodeFile(path)
+    val context = appContext.reactContext ?: throw Exceptions.ReactContextLost()
+    val uri = Uri.parse(photoUri)
+    context.contentResolver.openInputStream(uri).use { inputStream ->
+      return BitmapFactory.decodeStream(inputStream)
+    }
   }
 }

package/android/src/main/java/expo/modules/contacts/ContactsModule.kt

@@ -326,7 +326,7 @@ class ContactsModule : Module() {
     get() = (appContext.reactContext ?: throw Exceptions.ReactContextLost()).contentResolver
 
   private fun mutateContact(initContact: Contact?, data: Map<String, Any>): Contact {
-    val contact = initContact ?: Contact(UUID.randomUUID().toString())
+    val contact = initContact ?: Contact(UUID.randomUUID().toString(), appContext)
 
     data.safeGet<String>("firstName")?.let { contact.firstName = it }
     data.safeGet<String>("middleName")?.let { contact.middleName = it }
@@ -660,7 +660,7 @@ class ContactsModule : Module() {
       val contactId = cursor.getString(columnIndex)
 
       // add or update existing contact for iterating data based on contact id
-      val contact = map.getOrPut(contactId) { Contact(contactId) }
+      val contact = map.getOrPut(contactId) { Contact(contactId, appContext) }
       contact.fromCursor(cursor)
     }
     return map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-contacts",
-  "version": "14.0.4",
+  "version": "14.0.5",
   "description": "Provides access to the phone's system contacts.",
   "main": "build/Contacts.js",
   "types": "build/Contacts.d.ts",
@@ -40,5 +40,5 @@
     "expo": "*",
     "react-native": "*"
   },
-  "gitHead": "3fd37fd31fd818d833e85c4723b1578010da6967"
+  "gitHead": "d13f18276d52b15263754f35ec72befcb2785104"
 }