refactor(AppIntegrity): Use a snackbar instead of a toast to display …

…error message
Infomaniak · Dec 17, 2024 · fba120f · fba120f
1 parent 6d405c0
commit fba120f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
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
@@ -162,15 +162,6 @@ class ImportFilesViewModel @Inject constructor(
         _sendActionResult.value = SendActionResult.NotStarted
     }
 
-    fun startTransfer(appIntegrityManager: AppIntegrityManager) {
-        runCatching {
-            checkAppIntegrity(appIntegrityManager)
-        }.onFailure { exception ->
-            SentryLog.e(TAG, "Failed to start the upload", exception)
-            _sendActionResult.update { SendActionResult.Failure }
-        }
-    }
-
     //region App Integrity
     fun checkAppIntegrity() {
         _integrityCheckResult.value = AppIntegrityResult.Ongoing

diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
@@ -18,7 +18,6 @@
 package com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles
 
 import android.net.Uri
-import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
@@ -32,7 +31,6 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -82,6 +80,7 @@ fun ImportFilesScreen(
     val snackbarHostState = remember { SnackbarHostState() }
 
     HandleIntegrityCheckResult(
+        snackbarHostState = snackbarHostState,
         integrityCheckResult = { integrityCheckResult },
         resetResult = { importFilesViewModel.resetIntegrityCheckResult() },
     )
@@ -160,13 +159,12 @@ private fun HandleSendActionResult(
     navigateToUploadProgress: (transferType: TransferTypeUi, totalSize: Long) -> Unit,
     resetSendActionResult: () -> Unit,
 ) {
-    val context = LocalContext.current
-
+    val errorMessage = stringResource(R.string.errorUnknown)
     LaunchedEffect(getSendActionResult()) {
         when (val actionResult = getSendActionResult()) {
             is SendActionResult.Success -> navigateToUploadProgress(transferType(), actionResult.totalSize)
             is SendActionResult.Failure -> {
-                snackbarHostState.showSnackbar(context.getString(R.string.errorUnknown))
+                snackbarHostState.showSnackbar(errorMessage)
                 resetSendActionResult()
             }
             else -> Unit
@@ -176,14 +174,16 @@ private fun HandleSendActionResult(
 
 @Composable
 private fun HandleIntegrityCheckResult(
+    snackbarHostState: SnackbarHostState,
     integrityCheckResult: () -> AppIntegrityResult,
     resetResult: () -> Unit,
 ) {
     val result = integrityCheckResult()
-    val context = LocalContext.current
+    val errorMessage = stringResource(R.string.errorAppIntegrity)
+
     LaunchedEffect(result == AppIntegrityResult.Success || result == AppIntegrityResult.Fail) {
         if (integrityCheckResult() == AppIntegrityResult.Fail) { // TODO: Better error management
-            Toast.makeText(context, R.string.errorAppIntegrity, Toast.LENGTH_LONG).show()
+            snackbarHostState.showSnackbar(errorMessage)
         }
         resetResult()
     }