Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update libs + Core 0.10.0 #260

Merged
merged 2 commits into from
Dec 17, 2024
Merged

chore: Update libs + Core 0.10.0 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bebbbe
chore: Update libs + Core 0.10.0
sirambd Dec 17, 2024
0efb87a
chore: Add support for Core 0.10.0
sirambd Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/src/main/java/com/infomaniak/swisstransfer/di/SwissTransferInjectionModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportFilesViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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")
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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]
Expand Down
Loading