feat: Add Upload with v2 API

app/build.gradle.kts

@@ -257,6 +257,7 @@ dependencies {
     implementation(core.androidx.work.runtime.ktx)
     implementation(core.kotlinx.serialization.json)
     implementation(core.splitties.toast)
+    implementation(core.splitties.preferences)
     implementation(core.okhttp)
 
     // Test

app/src/main/java/com/infomaniak/swisstransfer/di/ApplicationModule.kt

@@ -19,6 +19,7 @@
 
 import android.app.Application
 import android.content.Context
+import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.WorkManager
 import com.infomaniak.core.appintegrity.AppIntegrityManager
@@ -75,9 +76,15 @@
         return InfomaniakLogin(
             context = appContext,
             loginUrl = "${LOGIN_ENDPOINT_URL}/",
-            appUID = ConfigUtils.safePackage,
+            appUID = ConfigUtils.safePackage.substringBefore(".preprod"),
             clientID = BuildConfig.CLIENT_ID,
             accessType = null,
+            sentryCallback = { message, extras ->
+                //TODO[Sentry]: Should we forward this to Sentry, or leave it only in logcat for debug?
+                val tag = "LoginIssue"
+                Log.e(tag, message)
+                Log.e(tag, extras.toString())
+            }
         )
     }
 }

app/src/main/java/com/infomaniak/swisstransfer/di/SwissTransferInjectionModule.kt

@@ -17,20 +17,25 @@
  */
 package com.infomaniak.swisstransfer.di
 
+import com.infomaniak.core.appintegrity.AppIntegrityManager
+import com.infomaniak.core.network.ApiEnvironment
 import com.infomaniak.multiplatform_swisstransfer.SharedApiUrlCreator
 import com.infomaniak.multiplatform_swisstransfer.SwissTransferInjection
-import com.infomaniak.multiplatform_swisstransfer.common.utils.ApiEnvironment
 import com.infomaniak.multiplatform_swisstransfer.managers.AccountManager
 import com.infomaniak.multiplatform_swisstransfer.managers.AppSettingsManager
 import com.infomaniak.multiplatform_swisstransfer.managers.FileManager
 import com.infomaniak.multiplatform_swisstransfer.managers.InMemoryUploadManager
 import com.infomaniak.multiplatform_swisstransfer.managers.TransferManager
-import com.infomaniak.swisstransfer.BuildConfig
+import com.infomaniak.multiplatform_swisstransfer.managers.UploadV2Manager
+import com.infomaniak.swisstransfer.upload.UploadSessionStarter
+import com.infomaniak.swisstransfer.upload.UploadSessionStarterV1
+import com.infomaniak.swisstransfer.upload.UploadSessionStarterV2
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
+import com.infomaniak.multiplatform_swisstransfer.common.utils.ApiEnvironment as KmpApiEnvironement
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -40,12 +45,29 @@ object SwissTransferInjectionModule {
     @Singleton
     fun provideSwissTransferInjection(@UserAgent userAgent: String): SwissTransferInjection {
         return SwissTransferInjection(
-            environment = if (BuildConfig.FLAVOR == "preprod") ApiEnvironment.Preprod else ApiEnvironment.Prod,
+            environment = ApiEnvironment.current.toKmpApiEnvironment(),
             userAgent = userAgent,
-            crashReport = crashReport
+            crashReport = crashReport,
+            databaseNameOrPath = "swisstransfer",
         )
     }
 
+    @Provides
+    fun provideUploadSessionStarter(
+        sti: SwissTransferInjection,
+        appIntegrityManager: AppIntegrityManager,
+        sharedApiUrlCreator: SharedApiUrlCreator,
+        legacyUploadManager: InMemoryUploadManager,
+        uploadManager: UploadV2Manager,
+    ): UploadSessionStarter = when {
+        sti.accountManager.shouldUseV1Api -> UploadSessionStarterV1(
+            appIntegrityManager = appIntegrityManager,
+            sharedApiUrlCreator = sharedApiUrlCreator,
+            uploadManager = legacyUploadManager,
+        )
+        else -> UploadSessionStarterV2(uploadManager)
+    }
+
     @Provides
     @Singleton
     fun provideTransferManager(sti: SwissTransferInjection): TransferManager = sti.transferManager
@@ -64,9 +86,21 @@ object SwissTransferInjectionModule {
 
     @Provides
     @Singleton
-    fun provideUploadManager(sti: SwissTransferInjection): InMemoryUploadManager = sti.inMemoryUploadManager
+    fun provideV1UploadManager(sti: SwissTransferInjection): InMemoryUploadManager = sti.inMemoryUploadManager
+
+    @Provides
+    @Singleton
+    fun provideUploadManager(sti: SwissTransferInjection): UploadV2Manager = sti.uploadV2Manager
 
     @Provides
     @Singleton
     fun provideSharedApiUrlCreator(sti: SwissTransferInjection): SharedApiUrlCreator = sti.sharedApiUrlCreator
 }
+
+private fun ApiEnvironment.toKmpApiEnvironment(): KmpApiEnvironement {
+    return when (this) {
+        ApiEnvironment.PreProd -> KmpApiEnvironement.Preprod
+        ApiEnvironment.Prod -> KmpApiEnvironement.Prod
+        is ApiEnvironment.Custom -> error("Custom api environment is not handled by the kmp lib")
+    }
+}

app/src/main/java/com/infomaniak/swisstransfer/ui/LaunchActivity.kt

@@ -43,9 +43,6 @@ class LaunchActivity : ComponentActivity() {
     @Inject
     lateinit var accountUtils: AccountUtils
 
-    @Inject
-    lateinit var accountPreferences: AccountPreferences
-
     @Inject
     lateinit var appSettingsManager: AppSettingsManager
 
@@ -103,7 +100,7 @@ class LaunchActivity : ComponentActivity() {
     private suspend fun connectLoggedOutUser() {
         if (!accountUtils.isUserConnected()) {
             accountUtils.loginGuestUser()
-            accountPreferences.isOnboardingDone = true
+            AccountPreferences().isOnboardingDone = true
         }
     }
 

app/src/main/java/com/infomaniak/swisstransfer/ui/MainApplication.kt

@@ -22,6 +22,7 @@ import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.infomaniak.core.common.AssociatedUserDataCleanable
 import com.infomaniak.core.crossapplogin.back.internal.deviceinfo.DeviceInfoUpdateManager
+import com.infomaniak.core.network.ApiEnvironment
 import com.infomaniak.core.network.NetworkConfiguration
 import com.infomaniak.core.sentry.SentryConfig.configureSentry
 import com.infomaniak.multiplatform_swisstransfer.managers.AccountManager
@@ -45,6 +46,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import splitties.init.injectAsAppCtx
 import javax.inject.Inject
 import com.infomaniak.multiplatform_swisstransfer.network.exceptions.NetworkException as KmpNetworkException
 
@@ -79,6 +81,11 @@ class MainApplication : Application(), Configuration.Provider {
     @IoDispatcher
     lateinit var ioDispatcher: CoroutineDispatcher
 
+    init {
+        injectAsAppCtx()
+        configureInfomaniakCore()
+    }
+
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
 
@@ -87,15 +94,14 @@ class MainApplication : Application(), Configuration.Provider {
     override fun onCreate() {
         super.onCreate()
 
-        configureInfomaniakCore()
         configureSentry()
 
         userDataCleanableList = listOf<AssociatedUserDataCleanable>(DeviceInfoUpdateManager)
 
         notificationUtils.initNotificationsChannel()
 
         globalCoroutineScope.launch {
-            accountUtils.init()
+            launch { accountUtils.activate() }
 
             launch(ioDispatcher) {
                 transferManager.getAllTransfers().collectLatest(thumbnailsLocalStorage::cleanExpiredThumbnails)
@@ -122,6 +128,7 @@ class MainApplication : Application(), Configuration.Provider {
             appId = ConfigUtils.safePackage,
             appVersionName = BuildConfig.VERSION_NAME,
             appVersionCode = BuildConfig.VERSION_CODE,
+            apiEnvironment = if (BuildConfig.FLAVOR == "preprod") ApiEnvironment.PreProd else ApiEnvironment.Prod
         )
     }
 

app/src/main/java/com/infomaniak/swisstransfer/ui/OnboardingActivity.kt

@@ -69,9 +69,6 @@ class OnboardingActivity : ComponentActivity() {
 
     private val shouldDisplayRequiredLogin by lazy { intent.getBooleanExtra(EXTRA_REQUIRED_LOGIN_KEY, false) }
 
-    @Inject
-    lateinit var accountPreferences: AccountPreferences
-
     @Inject
     lateinit var accountUtils: AccountUtils
 
@@ -206,8 +203,8 @@ class OnboardingActivity : ComponentActivity() {
         areButtonsLoading = false
     }
 
-    private fun Activity.completeOnboarding() {
-        accountPreferences.isOnboardingDone = true
+    private suspend fun Activity.completeOnboarding() {
+        AccountPreferences().isOnboardingDone = true
 
         Intent(this, MainActivity::class.java).also(::startActivity)
         finish()

app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItem.kt

@@ -93,7 +93,7 @@ fun TransferItem(
             Column(modifier = Modifier.weight(1.0f)) {
 
                 Text(
-                    text = createdDate,
+                    text = transfer.title ?: createdDate,
                     style = SwissTransferTheme.typography.bodyMedium,
                     color = SwissTransferTheme.colors.primaryTextColor,
                     maxLines = 1,

app/src/main/java/com/infomaniak/swisstransfer/ui/previewparameter/GroupedTransfersPreviewParameterProvider.kt

@@ -37,46 +37,58 @@ private val now get() = Clock.System.now().epochSeconds
 val transfersPreviewData = listOf(
     TransferUi(
         uuid = UUID.randomUUID().toString(),
+        linkId = UUID.randomUUID().toString(),
         createdDateTimestamp = now - (0.5f * SECONDS_IN_A_DAY).toLong(),
         expirationDateTimestamp = now + 3 * SECONDS_IN_A_DAY,
         sizeUploaded = 237_866_728L,
         downloadLimit = 250,
         downloadLeft = 123,
+        title = "Transfer title",
         message = "3ème transfert. RAS.",
         password = "my password",
         files = filesPreviewData,
+        apiSource = TransferUi.ApiSource.V1,
     ),
     TransferUi(
         uuid = UUID.randomUUID().toString(),
+        linkId = UUID.randomUUID().toString(),
         createdDateTimestamp = now - (0.6f * SECONDS_IN_A_DAY).toLong(),
         expirationDateTimestamp = now + 3 * SECONDS_IN_A_DAY,
         sizeUploaded = 237_866_728L,
         downloadLimit = 250,
         downloadLeft = 123,
+        title = null,
         message = null,
         password = "my password",
         files = filesPreviewData,
+        apiSource = TransferUi.ApiSource.V1,
     ),
     TransferUi(
         uuid = UUID.randomUUID().toString(),
+        linkId = UUID.randomUUID().toString(),
         createdDateTimestamp = now - 5L * SECONDS_IN_A_DAY,
         expirationDateTimestamp = now + 5L * SECONDS_IN_A_DAY,
         sizeUploaded = 89_723_143L,
         downloadLimit = 20,
         downloadLeft = 0,
+        title = null,
         message = null,
         password = null,
         files = filesPreviewData,
+        apiSource = TransferUi.ApiSource.V2,
     ),
     TransferUi(
         uuid = UUID.randomUUID().toString(),
+        linkId = UUID.randomUUID().toString(),
         createdDateTimestamp = now - 30L * SECONDS_IN_A_DAY,
         expirationDateTimestamp = now - 4L * SECONDS_IN_A_DAY,
         sizeUploaded = 57_689_032L,
         downloadLimit = 1,
         downloadLeft = 1,
+        title = null,
         message = "Coucou c'est moi le message de description du transfert.",
         password = "password",
         files = filesPreviewData,
+        apiSource = TransferUi.ApiSource.V2,
     ),
 )

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt

@@ -184,7 +184,7 @@ private fun Theme?.getString(): String {
 
 @Composable
 private fun ValidityPeriod?.getString(): String {
-    return this?.value?.toInt()?.let {
+    return this?.days?.let {
         pluralStringResource(R.plurals.settingsValidityPeriodValue, it, it)
     } ?: ""
 }

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsValidityPeriodScreen.kt

@@ -77,7 +77,7 @@ enum class ValidityPeriodOption(
 
 @Composable
 private fun getValidityPeriodTitle(validityPeriod: ValidityPeriod): String {
-    val count = validityPeriod.value.toInt()
+    val count = validityPeriod.days
     return pluralStringResource(R.plurals.settingsValidityPeriodValue, count, count)
 }
 

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsScreen.kt

@@ -71,10 +71,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.PermissionState
 import com.google.accompanist.permissions.rememberPermissionState
-import com.infomaniak.core.ui.compose.margin.Margin
-import com.infomaniak.core.ui.compose.preview.PreviewAllWindows
 import com.infomaniak.core.common.utils.FORMAT_DATE_FULL
 import com.infomaniak.core.common.utils.format
+import com.infomaniak.core.ui.compose.margin.Margin
+import com.infomaniak.core.ui.compose.preview.PreviewAllWindows
 import com.infomaniak.multiplatform_swisstransfer.common.ext.toDateFromSeconds
 import com.infomaniak.multiplatform_swisstransfer.common.interfaces.ui.FileUi
 import com.infomaniak.multiplatform_swisstransfer.common.interfaces.ui.TransferUi
@@ -106,6 +106,7 @@ import com.infomaniak.swisstransfer.ui.screen.main.transferdetails.emptystate.Em
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.pickfiles.components.DeeplinkPasswordAlertDialog
 import com.infomaniak.swisstransfer.ui.theme.LocalWindowAdaptiveInfo
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
+import com.infomaniak.swisstransfer.ui.utils.isV1
 import com.infomaniak.swisstransfer.ui.utils.isWindowSmall
 import com.infomaniak.swisstransfer.ui.utils.openFile
 import com.infomaniak.swisstransfer.ui.utils.shareText
@@ -244,14 +245,18 @@ private fun TransferDetailsScreen(
         }
     }
 
+    val title = getTransfer().title ?: getTransfer().createdDateTimestamp.toDateFromSeconds().format(FORMAT_DATE_FULL)
+
     SwissTransferScaffold(
         topBar = {
             SwissTransferTopAppBar(
-                title = getTransfer().createdDateTimestamp.toDateFromSeconds().format(FORMAT_DATE_FULL),
+                title = title,
                 navigationIcon = { if (windowAdaptiveInfo.isWindowSmall()) TopAppBarButtons.Back(onClick = navigateBack ?: {}) },
                 actions = {
                     when (direction) {
-                        TransferDirection.SENT -> downloadUi.TopAppBarButton()
+                        TransferDirection.SENT -> {
+                            if (getTransfer().isV1()) downloadUi.TopAppBarButton()
+                        }
                         TransferDirection.RECEIVED -> TopAppBarButtons.QrCode {
                             MatomoSwissTransfer.trackReceivedTransferEvent(MatomoName.ShowQRCode)
                             showQrCodeBottomSheet = true

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDetailsViewModel.kt

@@ -201,6 +201,7 @@ class TransferDetailsViewModel @Inject constructor(
 
     private fun TransferUi?.toUiState(isInLocal: Boolean): TransferDetailsUiState = when (this?.transferStatus) {
         TransferStatus.NOT_YET_FETCHED -> Loading
+        TransferStatus.PENDING_UPLOAD -> Loading
         TransferStatus.UNKNOWN -> Unknown
         TransferStatus.READY -> Success(this)
         TransferStatus.EXPIRED_DOWNLOAD_QUOTA -> ByQuota(downloadLimit, isInLocal)