From 76af41c6459358542834c2f3a8eb472b2b6b8f3c Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Mon, 2 Dec 2024 18:03:41 +0100 Subject: [PATCH] refactor: Move logic to KMP --- .../swisstransfer/ui/MainApplication.kt | 18 +----------------- .../swisstransfer/ui/utils/TransferUiExt.kt | 7 ------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/MainApplication.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/MainApplication.kt index 7997cd98f..12499faed 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/MainApplication.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/MainApplication.kt @@ -20,13 +20,10 @@ package com.infomaniak.swisstransfer.ui import android.app.Application import androidx.hilt.work.HiltWorkerFactory import androidx.work.Configuration -import com.infomaniak.multiplatform_swisstransfer.common.interfaces.ui.TransferUi -import com.infomaniak.multiplatform_swisstransfer.common.models.TransferDirection import com.infomaniak.multiplatform_swisstransfer.managers.AccountManager import com.infomaniak.multiplatform_swisstransfer.managers.TransferManager import com.infomaniak.swisstransfer.BuildConfig import com.infomaniak.swisstransfer.ui.utils.AccountUtils -import com.infomaniak.swisstransfer.ui.utils.getExpiredTransfers import dagger.hilt.android.HiltAndroidApp import io.sentry.SentryEvent import io.sentry.SentryOptions @@ -62,7 +59,7 @@ class MainApplication : Application(), Configuration.Provider { globalCoroutineScope.launch { accountUtils.init() - collectTransfers() + transferManager.deleteExpiredTransfers() } SentryAndroid.init(this) { options: SentryAndroidOptions -> @@ -73,17 +70,4 @@ class MainApplication : Application(), Configuration.Provider { } } } - - private suspend fun collectTransfers() { - transferManager.getTransfers(TransferDirection.SENT).collect(::deleteExpiredTransfers) - transferManager.getTransfers(TransferDirection.RECEIVED).collect(::deleteExpiredTransfers) - } - - private suspend fun deleteExpiredTransfers(transfers: List) { - deleteTransfers(transfers.getExpiredTransfers(since = 15)) - } - - private suspend fun deleteTransfers(transfers: List) { - transfers.forEach { transferManager.deleteTransfer(it.uuid) } - } } diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/TransferUiExt.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/TransferUiExt.kt index 1ed1d4046..5ef5d1457 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/TransferUiExt.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/utils/TransferUiExt.kt @@ -20,10 +20,3 @@ package com.infomaniak.swisstransfer.ui.utils import com.infomaniak.multiplatform_swisstransfer.common.interfaces.ui.TransferUi val TransferUi.isExpired: Boolean get() = expiresInDays < 0 || downloadLeft <= 0 - -/** - * Get Transfers that are expired since a certain amount of days. - * - * @param since The amount of days since this Transfer is expired. - */ -fun List.getExpiredTransfers(since: Int): List = filter { it.expiresInDays < -since }