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

fix: disable removing non-permanent clients [WPB-5700] #2485

Merged
merged 3 commits into from
Dec 4, 2023
Merged

fix: disable removing non-permanent clients [WPB-5700] #2485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d13e16d
fix: disable removing non-permanent clients [WPB-4393]
saleniuk Nov 29, 2023
0f68ee0
Merge branch 'release/candidate' into fix/disable-removing-non-perman…
saleniuk Dec 4, 2023
3b4bc4a
Merge branch 'release/candidate' into fix/disable-removing-non-perman…
saleniuk Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ fun DeviceDetailsContent(
.background(MaterialTheme.wireColorScheme.surface)
.wrapContentWidth(Alignment.CenterHorizontally)
) {
if (!state.isCurrentDevice && state.isSelfClient) {
if (state.canBeRemoved) {
Text(
text = stringResource(
id = if (BuildConfig.WIPE_ON_DEVICE_REMOVAL) {
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.wire.android.ui.authentication.devices.remove.RemoveDeviceDialogState
import com.wire.android.ui.authentication.devices.remove.RemoveDeviceError
import com.wire.android.ui.navArgs
import com.wire.android.ui.settings.devices.model.DeviceDetailsState
import com.wire.kalium.logic.data.client.ClientType
import com.wire.kalium.logic.data.client.DeleteClientParam
import com.wire.kalium.logic.data.conversation.ClientId
import com.wire.kalium.logic.data.user.UserId
Expand Down Expand Up @@ -115,17 +116,18 @@ class DeviceDetailsViewModel @Inject constructor(
private fun observeDeviceDetails() {
viewModelScope.launch {
observeClientDetails(userId, deviceId).collect { result ->
when (result) {
state = when (result) {
is GetClientDetailsResult.Failure.Generic -> {
appLogger.e("Error getting self clients $result")
state = state.copy(error = RemoveDeviceError.InitError)
state.copy(error = RemoveDeviceError.InitError)
}

is GetClientDetailsResult.Success -> {
state = state.copy(
state.copy(
device = Device(result.client),
isCurrentDevice = result.isCurrentClient,
removeDeviceDialogState = RemoveDeviceDialogState.Hidden
removeDeviceDialogState = RemoveDeviceDialogState.Hidden,
canBeRemoved = !result.isCurrentClient && isSelfClient && result.client.type == ClientType.Permanent,
Copy link
Contributor

Choose a reason for hiding this comment

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

Just thinking out loud: in the future, it would be nice to have this in Kalium. So Kalium can expose a isRemovable property for clients.

)
}
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ data class DeviceDetailsState(
val isSelfClient: Boolean = false,
val userName: String? = null,
val isE2eiCertificateActivated: Boolean = false,
val e2eiCertificate: E2eiCertificate = E2eiCertificate()
val e2eiCertificate: E2eiCertificate = E2eiCertificate(),
val canBeRemoved: Boolean = false,
)
57 changes: 55 additions & 2 deletions app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.wire.android.ui.navArgs
import com.wire.android.ui.settings.devices.DeviceDetailsViewModelTest.Arrangement.Companion.CLIENT_ID
import com.wire.kalium.logic.CoreFailure
import com.wire.kalium.logic.NetworkFailure
import com.wire.kalium.logic.data.client.ClientType
import com.wire.kalium.logic.data.user.UserId
import com.wire.kalium.logic.feature.client.ClientFingerprintUseCase
import com.wire.kalium.logic.feature.client.DeleteClientResult
Expand All @@ -37,6 +38,7 @@ import kotlinx.coroutines.test.advanceUntilIdle
import kotlinx.coroutines.test.runTest
import okio.IOException
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertFalse
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
Expand Down Expand Up @@ -192,6 +194,57 @@ class DeviceDetailsViewModelTest {
assertTrue(viewModel.state.error is RemoveDeviceError.None)
}

@Test
fun `given self legal hold client, when fetching state, then canBeRemoved is false`() = runTest {
// given
val (_, viewModel) = Arrangement()
.withRequiredMockSetup()
.withClientDetailsResult(GetClientDetailsResult.Success(TestClient.CLIENT.copy(type = ClientType.LegalHold), false))
.arrange()
// then
assertFalse(viewModel.state.canBeRemoved)
}
@Test
fun `given self temporary client, when fetching state, then canBeRemoved is true`() = runTest {
// given
val (_, viewModel) = Arrangement()
.withRequiredMockSetup()
.withClientDetailsResult(GetClientDetailsResult.Success(TestClient.CLIENT.copy(type = ClientType.Temporary), false))
.arrange()
// then
assertFalse(viewModel.state.canBeRemoved)
}
@Test
fun `given self permanent client, when fetching state, then canBeRemoved is true`() = runTest {
// given
val (_, viewModel) = Arrangement()
.withRequiredMockSetup()
.withClientDetailsResult(GetClientDetailsResult.Success(TestClient.CLIENT.copy(type = ClientType.Permanent), false))
.arrange()
// then
assertTrue(viewModel.state.canBeRemoved)
}
@Test
fun `given self permanent current client, when fetching state, then canBeRemoved is false`() = runTest {
// given
val (_, viewModel) = Arrangement()
.withRequiredMockSetup()
.withClientDetailsResult(GetClientDetailsResult.Success(TestClient.CLIENT.copy(type = ClientType.Permanent), true))
.arrange()
// then
assertFalse(viewModel.state.canBeRemoved)
}
@Test
fun `given other user permanent client, when fetching state, then canBeRemoved is false`() = runTest {
// given
val (_, viewModel) = Arrangement()
.withRequiredMockSetup(userId = UserId("otherUserId", "otherUserDomain"))
.withClientDetailsResult(GetClientDetailsResult.Success(TestClient.CLIENT.copy(type = ClientType.Permanent), false))
.arrange()
// then
assertFalse(viewModel.state.canBeRemoved)
}

private class Arrangement {

@MockK
Expand Down Expand Up @@ -269,9 +322,9 @@ class DeviceDetailsViewModelTest {
coEvery { deleteClientUseCase(any()) } returns result
}

fun withRequiredMockSetup() = apply {
fun withRequiredMockSetup(userId: UserId = currentUserId) = apply {
every { savedStateHandle.navArgs<DeviceDetailsNavArgs>() } returns DeviceDetailsNavArgs(
userId = currentUserId,
userId = userId,
clientId = CLIENT_ID
)
}
Expand Down