diff --git a/app/src/main/java/org/linphone/ui/MainActivity.kt b/app/src/main/java/org/linphone/ui/MainActivity.kt index 1a64c43b0..dec864a65 100644 --- a/app/src/main/java/org/linphone/ui/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/MainActivity.kt @@ -27,15 +27,8 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.view.WindowCompat import androidx.databinding.DataBindingUtil -import androidx.emoji2.text.EmojiCompat -import androidx.lifecycle.lifecycleScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R -import org.linphone.core.tools.Log import org.linphone.databinding.MainActivityBinding class MainActivity : AppCompatActivity() { @@ -98,6 +91,9 @@ class MainActivity : AppCompatActivity() { } private fun loadContacts() { + coreContext.contactsManager.loadContacts(this) + + /* TODO: Uncomment later, only fixes a small UI display issue for contacts with emoji in the name val emojiCompat = coreContext.emojiCompat lifecycleScope.launch { withContext(Dispatchers.IO) { @@ -108,13 +104,13 @@ class MainActivity : AppCompatActivity() { } Log.i( - "[Main Activity] Emoji compat library loading status is ${emojiCompat.loadState}, loading contacts" + "[Main Activity] Emoji compat library loading status is ${emojiCompat.loadState}, re-loading contacts" ) coreContext.postOnMainThread { // Contacts loading must be started from UI thread coreContext.contactsManager.loadContacts(this@MainActivity) } } - } + }*/ } } diff --git a/app/src/main/java/org/linphone/ui/contacts/fragment/NewContactFragment.kt b/app/src/main/java/org/linphone/ui/contacts/fragment/NewContactFragment.kt index 64547228d..932855b83 100644 --- a/app/src/main/java/org/linphone/ui/contacts/fragment/NewContactFragment.kt +++ b/app/src/main/java/org/linphone/ui/contacts/fragment/NewContactFragment.kt @@ -23,7 +23,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.animation.Animation import androidx.navigation.fragment.findNavController import org.linphone.databinding.NewContactFragmentBinding import org.linphone.ui.fragment.GenericFragment