diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt index 7355465aa0..7aa3955d07 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt @@ -30,13 +30,11 @@ import im.vector.app.R import im.vector.app.core.di.MavericksAssistedViewModelFactory import im.vector.app.core.di.hiltMavericksViewModelFactory import im.vector.app.core.platform.VectorViewModel -import im.vector.app.core.resources.DateProvider import im.vector.app.core.resources.StringProvider -import im.vector.app.core.resources.toTimestamp import im.vector.app.core.utils.PublishDataSource import im.vector.app.features.auth.ReAuthActivity import im.vector.app.features.login.ReAuthHelper -import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS +import im.vector.app.features.settings.devices.v2.list.CheckIfSessionIsInactiveUseCase import im.vector.lib.core.utils.flow.throttleFirst import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.combine @@ -71,7 +69,6 @@ import org.matrix.android.sdk.api.util.awaitCallback import org.matrix.android.sdk.api.util.fromBase64 import org.matrix.android.sdk.flow.flow import timber.log.Timber -import java.util.concurrent.TimeUnit import javax.net.ssl.HttpsURLConnection import kotlin.coroutines.Continuation import kotlin.coroutines.resume @@ -102,6 +99,7 @@ class DevicesViewModel @AssistedInject constructor( private val reAuthHelper: ReAuthHelper, private val stringProvider: StringProvider, private val matrix: Matrix, + private val checkIfSessionIsInactiveUseCase: CheckIfSessionIsInactiveUseCase, ) : VectorViewModel(initialState), VerificationService.Listener { var uiaContinuation: Continuation? = null @@ -133,7 +131,7 @@ class DevicesViewModel @AssistedInject constructor( session.flow().liveMyDevicesInfo() ) { cryptoList, infoList -> val unverifiedSessionsCount = cryptoList.count { !it.trustLevel?.isVerified().orFalse() } - val inactiveSessionsCount = infoList.count { isInactiveSession(it.date) } + val inactiveSessionsCount = infoList.count { checkIfSessionIsInactiveUseCase.execute(it.date) } setState { copy( unverifiedSessionsCount = unverifiedSessionsCount, @@ -203,14 +201,6 @@ class DevicesViewModel @AssistedInject constructor( queryRefreshDevicesList() } - private fun isInactiveSession(lastSeenTs: Long): Boolean { - val lastSeenDate = DateProvider.toLocalDateTime(lastSeenTs) - val currentDate = DateProvider.currentLocalDateTime() - val diffMilliseconds = currentDate.toTimestamp() - lastSeenDate.toTimestamp() - val diffDays = TimeUnit.MILLISECONDS.toDays(diffMilliseconds) - return diffDays > SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS - } - override fun onCleared() { session.cryptoService().verificationService().removeListener(this) super.onCleared() diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt new file mode 100644 index 0000000000..c5d5f804a6 --- /dev/null +++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CheckIfSessionIsInactiveUseCase.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2022 New Vector Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package im.vector.app.features.settings.devices.v2.list + +import im.vector.app.core.resources.DateProvider +import im.vector.app.core.resources.toTimestamp +import java.util.concurrent.TimeUnit +import javax.inject.Inject + +class CheckIfSessionIsInactiveUseCase @Inject constructor() { + + fun execute(lastSeenTs: Long): Boolean { + val lastSeenDate = DateProvider.toLocalDateTime(lastSeenTs) + val currentDate = DateProvider.currentLocalDateTime() + val diffMilliseconds = currentDate.toTimestamp() - lastSeenDate.toTimestamp() + val diffDays = TimeUnit.MILLISECONDS.toDays(diffMilliseconds) + return diffDays >= SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS + } +}