refactor(AppIntegrity): Move AppIntegrityManager in screen instead of…

… passing it from the activity
Infomaniak · Dec 5, 2024 · a2cdc3d · a2cdc3d
1 parent 2580f4a
commit a2cdc3d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt
@@ -21,22 +21,18 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import com.infomaniak.core2.appintegrity.AppIntegrityManager
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.NewTransferScreen
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class NewTransferActivity : ComponentActivity() {
-
-    private val appIntegrityManager by lazy { AppIntegrityManager(appContext = this) }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
             SwissTransferTheme {
-                NewTransferScreen(closeActivity = { finish() }, appIntegrityManager)
+                NewTransferScreen(closeActivity = { finish() })
             }
         }
     }

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferNavHost.kt
@@ -22,7 +22,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
-import com.infomaniak.core2.appintegrity.AppIntegrityManager
 import com.infomaniak.swisstransfer.ui.navigation.NewTransferNavigation
 import com.infomaniak.swisstransfer.ui.navigation.NewTransferNavigation.*
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.ImportFilesScreen
@@ -32,7 +31,7 @@ import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadProgressS
 import com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.UploadSuccessScreen
 
 @Composable
-fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Unit, appIntegrityManager: AppIntegrityManager) {
+fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Unit) {
 
     NavHost(navController, NewTransferNavigation.startDestination) {
         composable<ImportFilesDestination> {
@@ -41,7 +40,6 @@ fun NewTransferNavHost(navController: NavHostController, closeActivity: () -> Un
                 navigateToUploadProgress = { transferType, totalSize ->
                     navController.navigate(UploadProgressDestination(transferType, totalSize))
                 },
-                appIntegrityManager = appIntegrityManager
             )
         }
         composable<ValidateUserEmailDestination> {

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/NewTransferScreen.kt
@@ -18,22 +18,20 @@
 package com.infomaniak.swisstransfer.ui.screen.newtransfer
 
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.compose.rememberNavController
-import com.infomaniak.core2.appintegrity.AppIntegrityManager
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewAllWindows
 
 @Composable
-fun NewTransferScreen(closeActivity: () -> Unit, appIntegrityManager: AppIntegrityManager) {
+fun NewTransferScreen(closeActivity: () -> Unit) {
     val navController = rememberNavController()
-    NewTransferNavHost(navController, closeActivity, appIntegrityManager)
+    NewTransferNavHost(navController, closeActivity)
 }
 
 @PreviewAllWindows
 @Composable
 private fun NewTransferPreview() {
     SwissTransferTheme {
-        NewTransferScreen({}, AppIntegrityManager(appContext = LocalContext.current))
+        NewTransferScreen {}
     }
 }
diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
@@ -61,8 +61,10 @@ fun ImportFilesScreen(
     importFilesViewModel: ImportFilesViewModel = hiltViewModel<ImportFilesViewModel>(),
     closeActivity: () -> Unit,
     navigateToUploadProgress: (transferType: TransferTypeUi, totalSize: Long) -> Unit,
-    appIntegrityManager: AppIntegrityManager,
 ) {
+    val appContext = LocalContext.current.applicationContext
+    val appIntegrityManager by lazy { AppIntegrityManager(appContext) }
+
     val files by importFilesViewModel.importedFilesDebounced.collectAsStateWithLifecycle()
     val filesToImportCount by importFilesViewModel.filesToImportCount.collectAsStateWithLifecycle()
     val currentSessionFilesCount by importFilesViewModel.currentSessionFilesCount.collectAsStateWithLifecycle()