From 72edf5c08bcc68544f0382fa344f0bad252282af Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 4 Aug 2023 11:34:43 -0300 Subject: [PATCH] Ignore call links check if ff is disabled. --- .../org/thoughtcrime/securesms/calls/links/CallLinks.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt index eb5cc80b93..88b7aa86fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt @@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.ApplicationDependencies import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId +import org.thoughtcrime.securesms.util.FeatureFlags import java.net.URLDecoder /** @@ -53,6 +54,10 @@ object CallLinks { @JvmStatic fun isCallLink(url: String): Boolean { + if (FeatureFlags.adHocCalling()) { + return false + } + if (!url.startsWith(HTTPS_LINK_PREFIX) && !url.startsWith(SNGL_LINK_PREFIX)) { Log.w(TAG, "Invalid url prefix.") return false @@ -63,6 +68,10 @@ object CallLinks { @JvmStatic fun parseUrl(url: String): CallLinkRootKey? { + if (FeatureFlags.adHocCalling()) { + return null + } + if (!url.startsWith(HTTPS_LINK_PREFIX) && !url.startsWith(SNGL_LINK_PREFIX)) { Log.w(TAG, "Invalid url prefix.") return null