diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
index a9749e6a56..bb9babbcdc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -335,9 +335,19 @@ public class CommunicationActions {
}
public static void handlePotentialCallLinkUrl(@NonNull FragmentActivity activity, @NonNull String potentialUrl) {
+ if (!FeatureFlags.adHocCalling()) {
+ Toast.makeText(activity, R.string.CommunicationActions_cant_join_call, Toast.LENGTH_SHORT).show();
+ return;
+ }
+
CallLinkRootKey rootKey = CallLinks.parseUrl(potentialUrl);
if (rootKey == null) {
Log.w(TAG, "Failed to parse root key from call link");
+ new MaterialAlertDialogBuilder(activity)
+ .setTitle(R.string.CommunicationActions_invalid_link)
+ .setMessage(R.string.CommunicationActions_this_is_not_a_valid_call_link)
+ .setPositiveButton(android.R.string.ok, null)
+ .show();
return;
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e1a2a276ce..f3e1df0880 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -242,6 +242,10 @@
Carrier charges may apply. The number you are calling is not registered with Signal. This call will be placed through your mobile carrier, not over the internet.
Can\'t join call
This call link is no longer valid.
+
+ Invalid link
+
+ This is not a valid call link. Make sure the entire link is intact and correct before attempting to join.