diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt index 66d1ed98a..a1932bfa6 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt @@ -24,7 +24,7 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R -import org.linphone.activities.assistant.AssistantActivity +import org.linphone.activities.SnackBarActivity import org.linphone.activities.assistant.viewmodels.* import org.linphone.activities.navigateToEchoCancellerCalibration import org.linphone.activities.navigateToPhoneAccountValidation @@ -99,7 +99,7 @@ class PhoneAccountLinkingFragment : AbstractPhoneFragment - (requireActivity() as AssistantActivity).showSnackBar(message) + (requireActivity() as SnackBarActivity).showSnackBar(message) } } diff --git a/app/src/main/java/org/linphone/contact/AsyncContactsLoader.kt b/app/src/main/java/org/linphone/contact/AsyncContactsLoader.kt index b554d0a40..c531b2d6e 100644 --- a/app/src/main/java/org/linphone/contact/AsyncContactsLoader.kt +++ b/app/src/main/java/org/linphone/contact/AsyncContactsLoader.kt @@ -109,14 +109,20 @@ class AsyncContactsLoader(private val context: Context) : Log.i("[Contacts Loader] Only fetching contacts in default directory") selection = ContactsContract.Data.IN_DEFAULT_DIRECTORY + " == 1" } - val cursor: Cursor? = context.contentResolver - .query( - ContactsContract.Data.CONTENT_URI, - projection, - selection, - null, - null - ) + + val cursor: Cursor? = try { + context.contentResolver + .query( + ContactsContract.Data.CONTENT_URI, + projection, + selection, + null, + null + ) + } catch (e: Exception) { + Log.e("[Contacts Loader] Failed to get contacts cursor: $e") + null + } if (cursor != null) { Log.i("[Contacts Loader] Found ${cursor.count} entries in cursor")