Removing non necessary session arg from ViewEvent

vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewEvent.kt

@@ -18,7 +18,6 @@ package im.vector.app.features.settings.devices.v2
 
 import im.vector.app.core.platform.VectorViewEvents
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
-import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 
@@ -28,7 +27,7 @@ sealed class DevicesViewEvent : VectorViewEvents {
     data class RequestReAuth(val registrationFlowResponse: RegistrationFlowResponse, val lastErrorCode: String?) : DevicesViewEvent()
     data class PromptRenameDevice(val deviceInfo: DeviceInfo) : DevicesViewEvent()
     data class ShowVerifyDevice(val userId: String, val transactionId: String?) : DevicesViewEvent()
-    data class SelfVerification(val session: Session) : DevicesViewEvent()
+    object SelfVerification : DevicesViewEvent()
     data class ShowManuallyVerify(val cryptoDeviceInfo: CryptoDeviceInfo) : DevicesViewEvent()
     object PromptResetSecrets : DevicesViewEvent()
 }

vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt

@@ -105,9 +105,7 @@ class DevicesViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val currentSessionCanBeVerified = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
             if (currentSessionCanBeVerified) {
-                activeSessionHolder.getSafeActiveSession()?.let { session ->
+                _viewEvents.post(DevicesViewEvent.SelfVerification)
-                    _viewEvents.post(DevicesViewEvent.SelfVerification(session))
-                }
             } else {
                 _viewEvents.post(DevicesViewEvent.PromptResetSecrets)
             }

vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewEvent.kt

@@ -17,9 +17,8 @@
 package im.vector.app.features.settings.devices.v2.overview
 
 import im.vector.app.core.platform.VectorViewEvents
-import org.matrix.android.sdk.api.session.Session
 
 sealed class SessionOverviewViewEvent : VectorViewEvents {
-    data class SelfVerification(val session: Session) : SessionOverviewViewEvent()
+    object SelfVerification : SessionOverviewViewEvent()
     object PromptResetSecrets : SessionOverviewViewEvent()
 }

vector/src/main/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModel.kt

@@ -21,7 +21,6 @@ import com.airbnb.mvrx.Success
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
@@ -33,7 +32,6 @@ import kotlinx.coroutines.launch
 
 class SessionOverviewViewModel @AssistedInject constructor(
         @Assisted val initialState: SessionOverviewViewState,
-        private val activeSessionHolder: ActiveSessionHolder,
         private val isCurrentSessionUseCase: IsCurrentSessionUseCase,
         private val getDeviceFullInfoUseCase: GetDeviceFullInfoUseCase,
         private val checkIfCurrentSessionCanBeVerifiedUseCase: CheckIfCurrentSessionCanBeVerifiedUseCase,
@@ -79,9 +77,7 @@ class SessionOverviewViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val currentSessionCanBeVerified = checkIfCurrentSessionCanBeVerifiedUseCase.execute()
             if (currentSessionCanBeVerified) {
-                activeSessionHolder.getSafeActiveSession()?.let { session ->
+                _viewEvents.post(SessionOverviewViewEvent.SelfVerification)
-                    _viewEvents.post(SessionOverviewViewEvent.SelfVerification(session))
-                }
             } else {
                 _viewEvents.post(SessionOverviewViewEvent.PromptResetSecrets)
             }

vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt

@@ -21,7 +21,6 @@ import com.airbnb.mvrx.test.MvRxTestRule
 import im.vector.app.features.settings.devices.v2.DeviceFullInfo
 import im.vector.app.features.settings.devices.v2.IsCurrentSessionUseCase
 import im.vector.app.features.settings.devices.v2.verification.CheckIfCurrentSessionCanBeVerifiedUseCase
-import im.vector.app.test.fakes.FakeActiveSessionHolder
 import im.vector.app.test.test
 import im.vector.app.test.testDispatcher
 import io.mockk.coEvery
@@ -43,14 +42,12 @@ class SessionOverviewViewModelTest {
     private val args = SessionOverviewArgs(
             deviceId = A_SESSION_ID
     )
-    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
     private val isCurrentSessionUseCase = mockk<IsCurrentSessionUseCase>()
     private val getDeviceFullInfoUseCase = mockk<GetDeviceFullInfoUseCase>()
     private val checkIfCurrentSessionCanBeVerifiedUseCase = mockk<CheckIfCurrentSessionCanBeVerifiedUseCase>()
 
     private fun createViewModel() = SessionOverviewViewModel(
             initialState = SessionOverviewViewState(args),
-            activeSessionHolder = fakeActiveSessionHolder.instance,
             isCurrentSessionUseCase = isCurrentSessionUseCase,
             getDeviceFullInfoUseCase = getDeviceFullInfoUseCase,
             checkIfCurrentSessionCanBeVerifiedUseCase = checkIfCurrentSessionCanBeVerifiedUseCase,