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

Unify the way we decide whether a room is a DM or a group room #3100

Merged
merged 8 commits into from
Jul 10, 2024
+195 −73
Merged

Unify the way we decide whether a room is a DM or a group room #3100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e40884c
Add centralised 'room is DM' check
jmartinesp Jul 9, 2024
c610aa3
Use the centralised method and extension functions through the app, i…
jmartinesp Jul 9, 2024
5266c32
Fix unexpected screenshot changes
jmartinesp Jul 9, 2024
e103163
`InviteData` should use `isDm`, not `isDirect`
jmartinesp Jul 10, 2024
84e1c66
`JoinRoomPresenter` should use `isDm`, not `isDirect`
jmartinesp Jul 10, 2024
c1e23f9
Remove unnecessary override in `FakeMatrixRoom`
jmartinesp Jul 10, 2024
6f3deb0
Update screenshots
Jul 10, 2024
c583311
Fix parameter in test
jmartinesp Jul 10, 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
4 changes: 2 additions & 2 deletions ...otlin/io/element/android/features/invite/api/response/AcceptDeclineInviteStateProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDec
anAcceptDeclineInviteState(),
anAcceptDeclineInviteState(
invite = Optional.of(
InviteData(RoomId("!room:matrix.org"), isDirect = true, roomName = "Alice"),
InviteData(RoomId("!room:matrix.org"), isDm = true, roomName = "Alice"),
),
declineAction = AsyncAction.Confirming,
),
anAcceptDeclineInviteState(
invite = Optional.of(
InviteData(RoomId("!room:matrix.org"), isDirect = false, roomName = "Some room"),
InviteData(RoomId("!room:matrix.org"), isDm = false, roomName = "Some room"),
),
declineAction = AsyncAction.Confirming,
),
Expand Down
2 changes: 1 addition & 1 deletion .../invite/api/src/main/kotlin/io/element/android/features/invite/api/response/InviteData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ import io.element.android.libraries.matrix.api.core.RoomId
data class InviteData(
val roomId: RoomId,
val roomName: String,
val isDirect: Boolean,
val isDm: Boolean,
)
4 changes: 2 additions & 2 deletions ...c/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ private fun DeclineConfirmationDialog(
onDismissClick: () -> Unit,
modifier: Modifier = Modifier
) {
val contentResource = if (invite.isDirect) {
val contentResource = if (invite.isDm) {
R.string.screen_invites_decline_direct_chat_message
} else {
R.string.screen_invites_decline_chat_message
}

val titleResource = if (invite.isDirect) {
val titleResource = if (invite.isDm) {
R.string.screen_invites_decline_direct_chat_title
} else {
R.string.screen_invites_decline_chat_title
Expand Down
2 changes: 1 addition & 1 deletion ...tlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class AcceptDeclineInvitePresenterTest {
return InviteData(
roomId = roomId,
roomName = name,
isDirect = isDirect
isDm = isDirect
Copy link
Member

Choose a reason for hiding this comment

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

Maybe rename also the parameter.

)
}

Expand Down
2 changes: 1 addition & 1 deletion ...nroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ internal fun ContentState.toInviteData(): InviteData? {
roomId = roomId,
// Note: name should not be null at this point, but use Id just in case...
roomName = name ?: roomId.value,
isDirect = isDirect
isDm = isDirect
)
else -> null
}
Expand Down
2 changes: 1 addition & 1 deletion ...mlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,5 +290,5 @@ internal fun RoomListRoomSummary.toInviteData() = InviteData(
roomId = roomId,
// Note: `name` should not be null at this point, but just in case, fallback to the roomId
roomName = name ?: roomId.value,
isDirect = isDm,
isDm = isDm,
)