From bc6debea89a3c559ed0f02da4277989e80dec80c Mon Sep 17 00:00:00 2001 From: Ed Geraghty Date: Sun, 22 Nov 2020 23:13:01 +0000 Subject: [PATCH 1/2] Disable native dialler integration on jitsi widget Native dialler integration breaks the jitsi widget for those of us with non-vanilla telephony frameworks. Disabling this integration (as is default on the Jitsi Meet Android app) allows us to also join conference calls, with no adverse effect on those for whom it already works. Signed-off-by: Ed Geraghty --- .../vector/app/features/call/conference/VectorJitsiActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt index 1ab6fb6363..43b41f7b5a 100644 --- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt @@ -109,6 +109,7 @@ class VectorJitsiActivity : VectorBaseActivity(), JitsiMeetActivityInterface, Ji .setFeatureFlag("invite.enabled", false) .setFeatureFlag("add-people.enabled", false) .setFeatureFlag("video-share.enabled", false) + .setFeatureFlag("call-integration.enabled", false) .setRoom(viewState.confId) .setSubject(viewState.subject) .build() From b125b473669c29716b2b21ba18d9516f4338c355 Mon Sep 17 00:00:00 2001 From: Ed Geraghty Date: Mon, 23 Nov 2020 00:01:05 +0000 Subject: [PATCH 2/2] Update CHANGES.md Signed-off-by: Ed Geraghty --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 80bb2c66b8..9e823db140 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ Bugfix 🐛: - Discard change dialog displayed by mistake when avatar has been updated - Try to fix cropped image in timeline (#2126) - Registration: annoying error message scares every new user when they add an email (#2391) + - Fix jitsi integration for those with non-vanilla dialler frameworks Translations 🗣: -