Merge pull request #2433 from EdGeraghty/patch-1

Disable native dialler integration on jitsi widget

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 🗣:
  -

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()