From 0efb87a701d240923fb45a9ee74e7ed8d23f2060 Mon Sep 17 00:00:00 2001 From: Abdourahamane Boinaidi Date: Tue, 17 Dec 2024 17:07:43 +0100 Subject: [PATCH] chore: Add support for Core 0.10.0 --- .../swisstransfer/di/SwissTransferInjectionModule.kt | 5 ++++- .../ui/screen/newtransfer/ImportFilesViewModel.kt | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/infomaniak/swisstransfer/di/SwissTransferInjectionModule.kt b/app/src/main/java/com/infomaniak/swisstransfer/di/SwissTransferInjectionModule.kt index d735eb5ec..c031732a8 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/di/SwissTransferInjectionModule.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/di/SwissTransferInjectionModule.kt @@ -20,6 +20,7 @@ package com.infomaniak.swisstransfer.di import android.app.Application import com.infomaniak.core2.appintegrity.AppIntegrityManager import com.infomaniak.multiplatform_swisstransfer.SwissTransferInjection +import com.infomaniak.multiplatform_swisstransfer.common.utils.ApiEnvironment import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -32,7 +33,9 @@ object SwissTransferInjectionModule { @Provides @Singleton - fun providesSwissTransferInjection() = SwissTransferInjection(userAgent = "Ktor client") // TODO: Waiting for api support + fun providesSwissTransferInjection(): SwissTransferInjection { + return SwissTransferInjection(environment = ApiEnvironment.Prod, userAgent = "Ktor client") + } @Provides @Singleton diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt index ba0886b86..e34cf2667 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt @@ -28,13 +28,13 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.infomaniak.core2.appintegrity.AppIntegrityManager import com.infomaniak.core2.appintegrity.AppIntegrityManager.Companion.APP_INTEGRITY_MANAGER_TAG +import com.infomaniak.multiplatform_swisstransfer.SharedApiUrlCreator import com.infomaniak.multiplatform_swisstransfer.common.interfaces.upload.RemoteUploadFile import com.infomaniak.multiplatform_swisstransfer.common.interfaces.upload.UploadFileSession import com.infomaniak.multiplatform_swisstransfer.common.utils.mapToList import com.infomaniak.multiplatform_swisstransfer.data.NewUploadSession import com.infomaniak.multiplatform_swisstransfer.managers.AppSettingsManager import com.infomaniak.multiplatform_swisstransfer.managers.UploadManager -import com.infomaniak.multiplatform_swisstransfer.network.utils.SharedApiRoutes import com.infomaniak.sentry.SentryLog import com.infomaniak.swisstransfer.BuildConfig import com.infomaniak.swisstransfer.di.IoDispatcher @@ -65,6 +65,7 @@ class ImportFilesViewModel @Inject constructor( private val appIntegrityManager: AppIntegrityManager, private val savedStateHandle: SavedStateHandle, private val importationFilesManager: ImportationFilesManager, + private val sharedApiUrlCreator: SharedApiUrlCreator, private val uploadManager: UploadManager, private val uploadWorkerScheduler: UploadWorker.Scheduler, @IoDispatcher private val ioDispatcher: CoroutineDispatcher, @@ -193,7 +194,7 @@ class ImportFilesViewModel @Inject constructor( appIntegrityManager.getApiIntegrityVerdict( integrityToken = appIntegrityToken, packageName = BuildConfig.APPLICATION_ID, - targetUrl = SharedApiRoutes.createUploadContainer, + targetUrl = sharedApiUrlCreator.createUploadContainerUrl, onSuccess = { attestationToken -> SentryLog.i(APP_INTEGRITY_MANAGER_TAG, "Api verdict check") Log.i(APP_INTEGRITY_MANAGER_TAG, "getApiIntegrityVerdict: $attestationToken")