diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt index a50cef6665..e0b6368fc1 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt @@ -151,4 +151,3 @@ class DevicesViewModel @AssistedInject constructor( // TODO implement when needed } } - diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt index 63e647e7c2..f41b3d4cf8 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt @@ -17,7 +17,6 @@ package im.vector.app.features.settings.devices.v2 import im.vector.app.core.di.ActiveSessionHolder -import im.vector.app.features.settings.devices.v2.CurrentSessionCrossSigningInfo import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.map diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetEncryptionTrustLevelForDeviceUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetEncryptionTrustLevelForDeviceUseCase.kt index 7f330b71d5..6f0dcbface 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetEncryptionTrustLevelForDeviceUseCase.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/GetEncryptionTrustLevelForDeviceUseCase.kt @@ -16,7 +16,6 @@ package im.vector.app.features.settings.devices.v2 -import im.vector.app.features.settings.devices.v2.CurrentSessionCrossSigningInfo import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel import javax.inject.Inject diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt index 72f8920bb0..cc5cdf6e39 100644 --- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt +++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/DevicesViewModelTest.kt @@ -121,10 +121,8 @@ class DevicesViewModelTest { // Then viewModelTest.assertLatestState { - it.devices is Success - && it.devices.invoke() == deviceFullInfoList - && it.inactiveSessionsCount == 1 - && it.unverifiedSessionsCount == 1 + it.devices is Success && it.devices.invoke() == deviceFullInfoList && + it.inactiveSessionsCount == 1 && it.unverifiedSessionsCount == 1 } viewModelTest.finish() } diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt index 739d5c6668..fa9f742976 100644 --- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt +++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/GetDeviceFullInfoListUseCaseTest.kt @@ -66,7 +66,7 @@ class GetDeviceFullInfoListUseCaseTest { } @Test - fun `given active session when getting list of device full info then the result list is correct and sorted in descending order`() = runTest(testDispatcher) { + fun `given active session when getting list of device full info then the list is correct and sorted in descending order`() = runTest(testDispatcher) { // Given val currentSessionCrossSigningInfo = givenCurrentSessionCrossSigningInfo() val fakeFlowSession = fakeActiveSessionHolder.fakeSession.givenFlowSession()