Fixed issues with contact creation & removal

app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt

@@ -84,6 +84,7 @@ class ContactEditorFragment : Fragment() {
         binding.setSaveChangesClickListener {
             val savedContact = viewModel.save()
             if (savedContact is NativeContact) {
+                savedContact.syncValuesFromAndroidContact(requireContext())
                 val deepLink = "linphone-android://contact/view/${savedContact.nativeId}"
                 Log.i("[Contact Editor] Displaying contact, starting deep link: $deepLink")
                 findNavController().navigate(Uri.parse(deepLink))

app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt

@@ -115,6 +115,11 @@ class DetailContactFragment : Fragment() {
             }
         }
 
+        binding.setDeleteClickListener {
+            viewModel.deleteContact()
+            findNavController().navigateUp()
+        }
+
         viewModel.onErrorEvent.observe(viewLifecycleOwner, Observer {
             it.consume { messageResourceId ->
                 (activity as MainActivity).showSnackBar(messageResourceId)

app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt

@@ -169,15 +169,17 @@ class MasterContactsFragment : MasterFragment() {
             } else {
                 // When trying to display a non-native contact from history
                 val addressString = arguments?.getString("address")
-                val address = Factory.instance().createAddress(addressString)
+                if (addressString != null) {
-                if (address != null) {
+                    val address = Factory.instance().createAddress(addressString)
-                    Log.i("[Contacts] Found friend native pointer parameter in arguments: ${address.asStringUriOnly()}")
+                    if (address != null) {
-                    arguments?.clear()
+                        Log.i("[Contacts] Found friend native pointer parameter in arguments: ${address.asStringUriOnly()}")
+                        arguments?.clear()
 
-                    val contact = coreContext.contactsManager.findContactByAddress(address)
+                        val contact = coreContext.contactsManager.findContactByAddress(address)
-                    if (contact != null) {
+                        if (contact != null) {
-                        Log.i("[Contacts] Found matching contact $contact")
+                            Log.i("[Contacts] Found matching contact $contact")
-                        adapter.selectedContactEvent.value = Event(contact)
+                            adapter.selectedContactEvent.value = Event(contact)
+                        }
                     }
                 }
             }

app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt

@@ -78,7 +78,9 @@ class ContactEditorViewModel(val c: Contact?) : ViewModel(), ContactViewModelInt
 
     fun save(): Contact {
         var contact = c
+        var created = false
         if (contact == null) {
+            created = true
             contact = if (PermissionHelper.get().hasWriteContactsPermission()) {
                 NativeContact(AppUtils.createAndroidContact().toString())
             } else {
@@ -107,6 +109,10 @@ class ContactEditorViewModel(val c: Contact?) : ViewModel(), ContactViewModelInt
                 }
             }
         }
+
+        if (created) {
+            coreContext.contactsManager.addContact(contact)
+        }
         return contact
     }
 

app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactViewModel.kt

@@ -19,6 +19,8 @@
  */
 package org.linphone.activities.main.contact.viewmodels
 
+import android.content.ContentProviderOperation
+import android.provider.ContactsContract
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -129,6 +131,36 @@ class ContactViewModel(private val c: Contact) : ErrorReportingViewModel(), Cont
         super.onCleared()
     }
 
+    fun deleteContact() {
+        val select = ContactsContract.Data.CONTACT_ID + " = ?"
+        val ops = java.util.ArrayList<ContentProviderOperation>()
+
+        if (c is NativeContact) {
+            val nativeContact: NativeContact = c
+            Log.i("[Contact] Setting Android contact id ${nativeContact.nativeId} to batch removal")
+            val args = arrayOf(nativeContact.nativeId)
+            ops.add(
+                ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI)
+                    .withSelection(select, args)
+                    .build()
+            )
+        }
+
+        if (c.friend != null) {
+            Log.i("[Contact] Removing friend")
+            c.friend?.remove()
+        }
+
+        if (ops.isNotEmpty()) {
+            try {
+                Log.i("[Contact] Removing ${ops.size} contacts")
+                coreContext.context.contentResolver.applyBatch(ContactsContract.AUTHORITY, ops)
+            } catch (e: Exception) {
+                Log.e("[Contact] $e")
+            }
+        }
+    }
+
     private fun updateNumbersAndAddresses() {
         val list = arrayListOf<ContactNumberOrAddressViewModel>()
         for (address in c.sipAddresses) {

app/src/main/java/org/linphone/contact/ContactsManager.kt

@@ -117,6 +117,11 @@ class ContactsManager(private val context: Context) {
         loadContactsTask?.executeOnExecutor(THREAD_POOL_EXECUTOR)
     }
 
+    @Synchronized
+    fun addContact(contact: Contact) {
+        contacts.add(contact)
+    }
+
     @Synchronized
     fun updateContacts(all: ArrayList<Contact>, sip: ArrayList<Contact>) {
         contacts.clear()