filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2433 from EdGeraghty/patch-1

Browse Source 
Disable native dialler integration on jitsi widget
This commit is contained in:
Benoit Marty 2020-11-24 16:45:12 +01:00 committed by GitHub
commit 920856512e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -22,6 +22,7 @@ Bugfix 🐛:
- Discard change dialog displayed by mistake when avatar has been updated - Discard change dialog displayed by mistake when avatar has been updated
- Try to fix cropped image in timeline (#2126) - Try to fix cropped image in timeline (#2126)
- Registration: annoying error message scares every new user when they add an email (#2391) - 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 🗣: Translations 🗣:
- -

1
vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
View File

@ -109,6 +109,7 @@ class VectorJitsiActivity : VectorBaseActivity(), JitsiMeetActivityInterface, Ji
.setFeatureFlag("invite.enabled", false) .setFeatureFlag("invite.enabled", false)
.setFeatureFlag("add-people.enabled", false) .setFeatureFlag("add-people.enabled", false)
.setFeatureFlag("video-share.enabled", false) .setFeatureFlag("video-share.enabled", false)
.setFeatureFlag("call-integration.enabled", false)
.setRoom(viewState.confId) .setRoom(viewState.confId)
.setSubject(viewState.subject) .setSubject(viewState.subject)
.build() .build()