From 5fb61b008b8d660dc42ed66c00053ae607975731 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 10 Jun 2025 16:05:56 +0200 Subject: [PATCH] set name when joining call --- .../thoughtcrime/securesms/connect/DcHelper.java | 3 ++- .../securesms/videochat/VideochatUtil.java | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index bfa9230ef..b8f6d22c3 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -74,7 +74,8 @@ public class DcHelper { public static final String CONFIG_WEBXDC_REALTIME_ENABLED = "webxdc_realtime_enabled"; public static final String CONFIG_PRIVATE_TAG = "private_tag"; - public static final String DEFAULT_VIDEOCHAT_URL = "https://meet.systemli.org/$ROOM#config.prejoinConfig.enabled=false&config.notifications=[]&config.toolbarButtons=[%22microphone%22,%22camera%22,%22hangup%22]"; + public static final String DEFAULT_VIDEOCHAT_URL_PREFIX = "https://meet.systemli.org/"; + public static final String DEFAULT_VIDEOCHAT_URL = DEFAULT_VIDEOCHAT_URL_PREFIX + "$ROOM#config.prejoinConfig.enabled=false&config.notifications=[]&config.toolbarButtons=[%22microphone%22,%22camera%22,%22hangup%22]"; public static DcContext getContext(@NonNull Context context) { return ApplicationContext.getInstance(context).dcContext; diff --git a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java index 4bf8d4b8c..8b0cd046a 100644 --- a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java +++ b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java @@ -14,6 +14,10 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.permissions.Permissions; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; + public class VideochatUtil { public void invite(Activity activity, int chatId) { @@ -52,10 +56,19 @@ public class VideochatUtil { .onAllGranted(() -> { DcContext dcContext = DcHelper.getContext(activity); DcMsg dcMsg = dcContext.getMsg(msgId); + String url = dcMsg.getVideochatUrl(); + if (url.startsWith(DcHelper.DEFAULT_VIDEOCHAT_URL_PREFIX) && url.contains("#")) { + String name = dcContext.getName(); + try { + name = URLEncoder.encode(dcContext.getName(), StandardCharsets.UTF_8.toString()); + } catch (UnsupportedEncodingException ignored) {} + url += "&userInfo.displayName=%22" + name +"%22"; + } + Intent intent = new Intent(activity, VideochatActivity.class); intent.setAction(Intent.ACTION_VIEW); intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, dcMsg.getChatId()); - intent.putExtra(VideochatActivity.EXTRA_URL, dcMsg.getVideochatUrl()); + intent.putExtra(VideochatActivity.EXTRA_URL, url); activity.startActivity(intent); }) .execute();