From 5bebbbee02014f08b139cc0e0391896dbfa9c0f5 Mon Sep 17 00:00:00 2001 From: Abdourahamane Boinaidi Date: Tue, 17 Dec 2024 17:06:50 +0100 Subject: [PATCH 1/2] chore: Update libs + Core 0.10.0 --- gradle/libs.versions.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a0e6fa3e..9e7aaa7db 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] activityCompose = "1.9.3" adaptiveLayout = "1.0.0" -agp = "8.7.2" +agp = "8.7.3" coilCompose = "3.0.2" -composeAlpha = "1.8.0-alpha06" -composeBom = "2024.10.01" +composeAlpha = "1.8.0-alpha07" +composeBom = "2024.12.01" constraintlayoutCompose = "1.1.0" coreKtx = "1.15.0" coreSplashscreen = "1.0.1" @@ -14,14 +14,14 @@ hiltAndroidx = "1.2.0" hiltNavigationCompose = "1.2.0" junit = "4.13.2" junitVersion = "1.2.1" -kotlin = "2.0.20" +kotlin = "2.0.21" lifecycleRuntimeKtx = "2.8.7" -navigation = "2.8.4" +navigation = "2.8.5" qrose = "1.0.1" recaptcha = "18.6.1" sentry = "4.12.0" serialization = "1.7.3" -swisstransfer = "0.9.6" +swisstransfer = "0.10.0" workmanager = "2.10.0" [libraries] From 0efb87a701d240923fb45a9ee74e7ed8d23f2060 Mon Sep 17 00:00:00 2001 From: Abdourahamane Boinaidi Date: Tue, 17 Dec 2024 17:07:43 +0100 Subject: [PATCH 2/2] 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")