refactor(AppIntegrity): Clean code

Infomaniak · Dec 13, 2024 · 1cfb281 · 1cfb281
1 parent ee91dc0
commit 1cfb281
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 22 deletions.
diff --git a/Core2/AppIntegrity/src/main/java/com/infomaniak/core2/appintegrity/AppIntegrityManager.kt b/Core2/AppIntegrity/src/main/java/com/infomaniak/core2/appintegrity/AppIntegrityManager.kt
@@ -38,7 +38,7 @@ class AppIntegrityManager(private val appContext: Context) {
     private var challenge = ""
     private var challengeId = ""
 
-    fun warmUpTokenProvider(appCloudNumber: Long, onFailure: (Throwable) -> Unit) {
+    fun warmUpTokenProvider(appCloudNumber: Long, onFailure: () -> Unit) {
         val integrityManager = IntegrityManagerFactory.createStandard(appContext)
         integrityManager.prepareIntegrityToken(
             PrepareIntegrityTokenRequest.builder().setCloudProjectNumber(appCloudNumber).build()
@@ -51,7 +51,7 @@ class AppIntegrityManager(private val appContext: Context) {
     fun requestIntegrityVerdictToken(
         requestHash: String,
         onSuccess: (String) -> Unit,
-        onFailure: (Throwable?) -> Unit,
+        onFailure: () -> Unit,
         onNullTokenProvider: (String) -> Unit,
     ) {
         if (appIntegrityTokenProvider == null) {
@@ -63,7 +63,7 @@ class AppIntegrityManager(private val appContext: Context) {
         }
     }
 
-    fun requestClassicIntegrityVerdictToken(onSuccess: (String) -> Unit, onFailure: (Throwable?) -> Unit) {
+    fun requestClassicIntegrityVerdictToken(onSuccess: (String) -> Unit, onFailure: () -> Unit) {
         val nonce = Base64.encodeToString(challenge.toByteArray(), Base64.DEFAULT)
 
         classicIntegrityTokenProvider.requestIntegrityToken(IntegrityTokenRequest.builder().setNonce(nonce).build())
@@ -76,7 +76,7 @@ class AppIntegrityManager(private val appContext: Context) {
         packageName: String,
         targetUrl: String,
         onSuccess: (String) -> Unit,
-        onFailure: (Throwable) -> Unit,
+        onFailure: () -> Unit,
     ) {
         runCatching {
             val apiResponse = appIntegrityRepository.getJwtToken(
@@ -91,7 +91,7 @@ class AppIntegrityManager(private val appContext: Context) {
         }
     }
 
-    suspend fun getChallenge(onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = runCatching {
+    suspend fun getChallenge(onSuccess: () -> Unit, onFailure: () -> Unit) = runCatching {
         generateChallengeId()
         val apiResponse = appIntegrityRepository.getChallenge(challengeId)
         SentryLog.d(
@@ -125,15 +125,15 @@ class AppIntegrityManager(private val appContext: Context) {
         challengeId = UUID.randomUUID().toString()
     }
 
-    private fun manageException(exception: Throwable, errorMessage: String, onFailure: (Throwable) -> Unit) {
+    private fun manageException(exception: Throwable, errorMessage: String, onFailure: () -> Unit) {
         if (exception !is NetworkException) {
             Sentry.captureMessage(errorMessage, SentryLevel.ERROR) { scope ->
                 scope.setTag("exception", exception.message.toString())
                 scope.setExtra("stacktrace", exception.printStackTrace().toString())
             }
         }
         exception.printStackTrace()
-        onFailure(exception)
+        onFailure()
     }
 
     companion object {

diff --git a/Core2/AppIntegrity/src/main/java/com/infomaniak/core2/appintegrity/AppIntegrityRepository.kt b/Core2/AppIntegrity/src/main/java/com/infomaniak/core2/appintegrity/AppIntegrityRepository.kt
@@ -63,7 +63,7 @@ internal class AppIntegrityRepository {
         return post<ApiResponse<String>>(
             url = Url(AppIntegrityRoutes.demo),
             data = mapOf<String, String>(),
-            appendHeaders = { append(ATTESTATION_TOKEN_HEADER, mobileToken) }
+            appendHeaders = { append(ATTESTATION_TOKEN_HEADER, mobileToken) },
         )
     }
 

diff --git a/Core2/AppIntegrity/src/test/java/com/infomaniak/core2/appintegrity/ExampleUnitTest.kt b/Core2/AppIntegrity/src/test/java/com/infomaniak/core2/appintegrity/ExampleUnitTest.kt
@@ -11,7 +11,6 @@ import io.ktor.client.statement.HttpResponse
 import io.ktor.http.*
 import io.ktor.utils.io.ByteReadChannel
 import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
 import org.junit.Test
 
 /**
@@ -34,12 +33,7 @@ class ExampleUnitTest {
     }
 
     @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-
-    @Test
-    fun toto() {
+    fun apiClientProviderTest() {
         runBlocking {
             post<ApiResponse<String>>(Url("toto"), data = mapOf("toto" to 1))
         }

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/NewTransferActivity.kt
@@ -27,6 +27,7 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class NewTransferActivity : ComponentActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()

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
@@ -195,8 +195,7 @@ class ImportFilesViewModel @Inject constructor(
         }
     }
 
-    private fun setFailedIntegrityResult(exception: Throwable?) {
-        SentryLog.e(APP_INTEGRITY_MANAGER_TAG, "Failed integrity check", exception)
+    private fun setFailedIntegrityResult() {
         _integrityCheckResult.value = AppIntegrityResult.Fail
     }
 

diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
@@ -397,9 +397,7 @@ private fun SendButton(
         showIndeterminateProgress = { integrityCheckResult() == AppIntegrityResult.Ongoing },
         enabled = { importedFiles().isNotEmpty() && !isImporting && isSenderEmailCorrect },
         progress = progress,
-        onClick = {
-            checkAppIntegrityBeforeSendingTransfer()
-        },
+        onClick = { checkAppIntegrityBeforeSendingTransfer() },
     )
 }
 

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/workers/UploadWorker.kt b/app/src/main/java/com/infomaniak/swisstransfer/workers/UploadWorker.kt
@@ -44,8 +44,6 @@ class UploadWorker @AssistedInject constructor(
     private val uploadManager: UploadManager,
 ) : BaseCoroutineWorker(appContext, params) {
 
-    private val appIntegrityManager by lazy { AppIntegrityManager(appContext) }
-
     private val fileChunkSizeManager by lazy {
         FileChunkSizeManager(
             chunkMinSize = EXPECTED_CHUNK_SIZE,