From c921a764e90fbdfead9da6623b074ecd65ace290 Mon Sep 17 00:00:00 2001 From: Philippe Loriaux Date: Thu, 11 Aug 2022 10:52:39 +0200 Subject: [PATCH] Display the option "Share invite link" only when the room is accessible by link (#6496) --- .../ContactsPicker/RoomInviteViewController.swift | 9 +++++++-- changelog.d/6496.change | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelog.d/6496.change diff --git a/Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift b/Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift index 900bd0c3ca..44643f4988 100644 --- a/Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift +++ b/Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift @@ -19,7 +19,8 @@ import Foundation class RoomInviteViewController: ContactsTableViewController { var room: MXRoom? - var roomAlias: String? + private var roomAlias: String? + private var joinRule: MXRoomJoinRule? private lazy var shareLinkPresenter: ShareInviteLinkPresenter = ShareInviteLinkPresenter() @@ -27,11 +28,15 @@ class RoomInviteViewController: ContactsTableViewController { super.viewDidLoad() roomAlias = room?.summary?.aliases?.first + joinRule = MXRoomJoinRule(identifier: room?.summary?.joinRule) setupShareInviteLinkHeader() } private func setupShareInviteLinkHeader() { - guard roomAlias != nil, RiotSettings.shared.allowInviteExernalUsers else { + guard roomAlias != nil, + RiotSettings.shared.allowInviteExernalUsers, + joinRule != .invite, + joinRule != .restricted else { contactsTableView.tableHeaderView = nil return } diff --git a/changelog.d/6496.change b/changelog.d/6496.change new file mode 100644 index 0000000000..e2d12eb78d --- /dev/null +++ b/changelog.d/6496.change @@ -0,0 +1 @@ +Display the option "Share invite link" only when the room is accessible by link.