Skip to content

RoomVC: Remove Jitsi slider for DMs #4707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

RoomVC: Remove Jitsi slider for DMs #4707

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13d1685
Remove Jitsi slider for DMs
ismailgulek Aug 13, 2021
73f5947
Add changelog
ismailgulek Aug 13, 2021
988c372
Merge branch 'develop' into ismail/4706_jitsi_for_dms
ismailgulek Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Riot/Modules/Room/RoomViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5162,7 +5162,7 @@ - (void)refreshRemoveJitsiWidgetView
{
Widget *jitsiWidget = [customizedRoomDataSource jitsiWidget];

if (jitsiWidget && self.canEditJitsiWidget)
if (jitsiWidget && self.canEditJitsiWidget && !self.roomDataSource.room.isDirect)
{
[self.removeJitsiWidgetView reset];
self.removeJitsiWidgetContainer.hidden = NO;
Expand Down
1 change: 1 addition & 0 deletions changelog.d/4706.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
RoomViewController: Remove Jitsi slider on DMs.