Skip to content
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

Fix for creating a knocking room #3499

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Fix for creating a knocking room #3499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cecff2
fix for join rule override in knocking rooms.
Velin92 Nov 8, 2024
e17bc87
improved some copies
Velin92 Nov 8, 2024
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
8 changes: 6 additions & 2 deletions ElementX/Resources/Localizations/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,10 @@
"screen_session_verification_request_title" = "Verification requested";
"screen_session_verification_they_dont_match" = "They don’t match";
"screen_session_verification_they_match" = "They match";
"screen_session_verification_use_another_device_subtitle" = "Make sure you have the app open in the other device before starting verification from here.";
"screen_session_verification_use_another_device_title" = "Open the app on another verified device";
"screen_session_verification_waiting_another_device_subtitle" = "You should see a popup on the other device. Start the verification from there now.";
"screen_session_verification_waiting_another_device_title" = "Start verification on the other device";
"screen_session_verification_waiting_to_accept_subtitle" = "Accept the request to start the verification process in your other session to continue.";
"screen_session_verification_waiting_to_accept_title" = "Waiting to accept request";
"screen_share_location_title" = "Share location";
Expand Down Expand Up @@ -913,8 +917,8 @@
"state_event_room_invite_you" = "%1$@ invited you";
"state_event_room_join" = "%1$@ joined the room";
"state_event_room_join_by_you" = "You joined the room";
"state_event_room_knock" = "%1$@ requested to join";
"state_event_room_knock_accepted" = "%1$@ allowed %2$@ to join";
"state_event_room_knock" = "%1$@ is requesting to join";
"state_event_room_knock_accepted" = "%1$@ granted access to %2$@";
"state_event_room_knock_accepted_by_you" = "You allowed %1$@ to join";
"state_event_room_knock_by_you" = "You requested to join";
"state_event_room_knock_denied" = "%1$@ rejected %2$@'s request to join";
Expand Down
12 changes: 10 additions & 2 deletions ElementX/Sources/Generated/Strings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2082,6 +2082,14 @@ internal enum L10n {
internal static var screenSessionVerificationTheyDontMatch: String { return L10n.tr("Localizable", "screen_session_verification_they_dont_match") }
/// They match
internal static var screenSessionVerificationTheyMatch: String { return L10n.tr("Localizable", "screen_session_verification_they_match") }
/// Make sure you have the app open in the other device before starting verification from here.
internal static var screenSessionVerificationUseAnotherDeviceSubtitle: String { return L10n.tr("Localizable", "screen_session_verification_use_another_device_subtitle") }
/// Open the app on another verified device
internal static var screenSessionVerificationUseAnotherDeviceTitle: String { return L10n.tr("Localizable", "screen_session_verification_use_another_device_title") }
/// You should see a popup on the other device. Start the verification from there now.
internal static var screenSessionVerificationWaitingAnotherDeviceSubtitle: String { return L10n.tr("Localizable", "screen_session_verification_waiting_another_device_subtitle") }
/// Start verification on the other device
internal static var screenSessionVerificationWaitingAnotherDeviceTitle: String { return L10n.tr("Localizable", "screen_session_verification_waiting_another_device_title") }
/// Accept the request to start the verification process in your other session to continue.
internal static var screenSessionVerificationWaitingToAcceptSubtitle: String { return L10n.tr("Localizable", "screen_session_verification_waiting_to_accept_subtitle") }
/// Waiting to accept request
Expand Down Expand Up @@ -2278,11 +2286,11 @@ internal enum L10n {
}
/// You joined the room
internal static var stateEventRoomJoinByYou: String { return L10n.tr("Localizable", "state_event_room_join_by_you") }
/// %1$@ requested to join
/// %1$@ is requesting to join
internal static func stateEventRoomKnock(_ p1: Any) -> String {
return L10n.tr("Localizable", "state_event_room_knock", String(describing: p1))
}
/// %1$@ allowed %2$@ to join
/// %1$@ granted access to %2$@
internal static func stateEventRoomKnockAccepted(_ p1: Any, _ p2: Any) -> String {
return L10n.tr("Localizable", "state_event_room_knock_accepted", String(describing: p1), String(describing: p2))
}
Expand Down
1 change: 1 addition & 0 deletions ElementX/Sources/Services/Client/ClientProxy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ class ClientProxy: ClientProxyProtocol {
invite: userIDs,
avatar: avatarURL?.absoluteString,
powerLevelContentOverride: isKnockingOnly ? Self.knockingRoomCreationPowerLevelOverrides : Self.roomCreationPowerLevelOverrides,
joinRuleOverride: isKnockingOnly ? .knock : nil,
// This is an FFI naming mistake, what is required is the `aliasLocalPart` not the whole alias
canonicalAlias: aliasLocalPart)
let roomID = try await client.createRoom(request: parameters)
Expand Down
Loading