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

Jump to bottom

When accepting an invite, expecting to see the room #6035

Merged
merged 2 commits into from
Apr 15, 2022
Merged

When accepting an invite, expecting to see the room #6035

merged 2 commits into from
Apr 15, 2022

Conversation

yostyle
Copy link
Contributor

@yostyle yostyle commented Apr 13, 2022

resolves #4986

@yostyle yostyle requested review from phloux, SBiOSoftWhare, giomfo and a team and removed request for SBiOSoftWhare, giomfo and phloux April 13, 2022 16:33
@github-actions
Copy link

github-actions bot commented Apr 13, 2022 •
edited
Loading

📱 Scan the QR code below to install the build for this PR.
🔒 This build is for internal testing purpose. Only devices listed in the ad-hoc provisioning profile can install Element Alpha.

QR code

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/5YZ6BZ

@giomfo giomfo self-assigned this Apr 14, 2022
giomfo
giomfo approved these changes Apr 15, 2022
View reviewed changes
Copy link
Member

@giomfo giomfo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Riot/Modules/Room/RoomViewController.m Outdated
if (self.autoJoinInvitedRoom)
{
[self joinRoom:nil];
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok to add this block here, but I highlight it is already present in [MXKRoomViewController onRoomDataSourceReady].
So another option would be to call [super onRoomDataSourceReady] by default (by removing the "else")

Both are ok for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

giomfo
giomfo approved these changes Apr 15, 2022
View reviewed changes
Copy link
Member

@giomfo giomfo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - tests ok

@yostyle yostyle merged commit c3d7d1e into develop Apr 15, 2022
@yostyle yostyle deleted the yostyle/join_and_show_room branch April 15, 2022 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaximeEvrard42 MaximeEvrard42 MaximeEvrard42 approved these changes

@giomfo giomfo giomfo approved these changes

Assignees

@giomfo giomfo

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

When accepting an invite, expecting to see the room (iOS)
3 participants
@yostyle @giomfo @MaximeEvrard42