diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt index 2dc72003da..fec159ad6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt @@ -1,5 +1,6 @@ package org.thoughtcrime.securesms.components.settings.conversation +import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent import android.graphics.PorterDuff @@ -82,6 +83,7 @@ import org.thoughtcrime.securesms.util.CommunicationActions import org.thoughtcrime.securesms.util.ContextUtil import org.thoughtcrime.securesms.util.ExpirationUtil import org.thoughtcrime.securesms.util.FeatureFlags +import org.thoughtcrime.securesms.util.IntentUtils import org.thoughtcrime.securesms.util.Material3OnScrollHelper import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.navigation.safeNavigate @@ -477,7 +479,11 @@ class ConversationSettingsFragment : DSLSettingsFragment( title = DSLSettingsText.from(R.string.ConversationSettingsFragment__add_as_a_contact), icon = DSLSettingsIcon.from(R.drawable.ic_plus_24), onClick = { - startActivityForResult(RecipientExporter.export(state.recipient).asAddContactIntent(), REQUEST_CODE_ADD_CONTACT) + try { + startActivityForResult(RecipientExporter.export(state.recipient).asAddContactIntent(), REQUEST_CODE_ADD_CONTACT) + } catch (e: ActivityNotFoundException) { + Toast.makeText(context, R.string.ConversationSettingsFragment__contacts_app_not_found, Toast.LENGTH_SHORT).show() + } } ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java index ae72c1e894..42ace3e6be 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java @@ -7,11 +7,14 @@ import android.content.Intent; import android.content.pm.LabeledIntent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import java.util.List; +import java.util.function.Consumer; public class IntentUtils { @@ -36,5 +39,4 @@ public class IntentUtils { } return null; } - } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 762b0f681b..8c11e8eebe 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4017,6 +4017,8 @@ Unknown ringtone + + Contacts app not found Send message Start video call Start audio call