Merge pull request #2023 from Infomaniak/clean-code

Clean code

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt

@@ -73,7 +73,7 @@ object ApiRepository : ApiRepositoryCore() {
         method: ApiController.ApiMethod,
         body: Any? = null,
         okHttpClient: OkHttpClient = HttpClient.okHttpClient,
-    ): T = ApiController.callApi(url, method, body, okHttpClient, true)
+    ): T = ApiController.callApi(url, method, body, okHttpClient, useKotlinxSerialization = true)
 
     fun ping(): ApiResponse<String> = callApi(ApiRoutes.ping(), GET)
 

app/src/main/java/com/infomaniak/mail/utils/DraftUtils.kt

@@ -17,7 +17,7 @@
  */
 package com.infomaniak.mail.utils
 
-import com.infomaniak.lib.core.api.ApiController
+import com.infomaniak.lib.core.api.ApiController.NetworkException
 import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.core.utils.isNetworkException
 import com.infomaniak.mail.data.cache.mailboxContent.DraftController
@@ -74,7 +74,7 @@ private suspend fun Draft.uploadAttachments(mailbox: Mailbox, draftController: D
         }.onFailure { exception ->
             setUploadStatus(attachment, UploadStatus.AWAITING, step = "after failing upload")
             SentryLog.d(ATTACHMENT_TAG, "${exception.message}", exception)
-            if ((exception as Exception).isNetworkException()) throw ApiController.NetworkException()
+            if ((exception as Exception).isNetworkException()) throw NetworkException()
             throw exception
         }
     }

app/src/main/java/com/infomaniak/mail/utils/SentryDebug.kt

@@ -223,7 +223,7 @@ object SentryDebug {
             scope.setExtra("folderRole", "${folder.role?.name}")
             scope.setExtra("folderId", folder.id)
             Sentry.captureMessage(
-                "Message is in wrong Folder (related to 'Message has multiple parent folders'",
+                "Message is in wrong Folder (related to 'Message has multiple parent folders')",
                 SentryLevel.ERROR,
             )
         }

app/src/main/java/com/infomaniak/mail/workers/BaseCoroutineWorker.kt

@@ -21,7 +21,7 @@ import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
-import com.infomaniak.lib.core.api.ApiController
+import com.infomaniak.lib.core.api.ApiController.NetworkException
 import io.sentry.Sentry
 import kotlinx.coroutines.CancellationException
 
@@ -39,7 +39,7 @@ abstract class BaseCoroutineWorker(appContext: Context, params: WorkerParameters
             exception.printStackTrace()
             when (exception) {
                 is CancellationException -> Result.failure()
-                is ApiController.NetworkException -> Result.retry()
+                is NetworkException -> Result.retry()
                 else -> {
                     Sentry.captureException(exception)
                     Result.failure()

app/src/main/java/com/infomaniak/mail/workers/DraftsActionsWorker.kt

@@ -23,7 +23,7 @@ import androidx.hilt.work.HiltWorker
 import androidx.lifecycle.LiveData
 import androidx.work.*
 import androidx.work.WorkInfo.State
-import com.infomaniak.lib.core.api.ApiController
+import com.infomaniak.lib.core.api.ApiController.NetworkException
 import com.infomaniak.lib.core.models.ApiResponse
 import com.infomaniak.lib.core.utils.FORMAT_DATE_WITH_TIMEZONE
 import com.infomaniak.lib.core.utils.SentryLog
@@ -165,7 +165,7 @@ class DraftsActionsWorker @AssistedInject constructor(
                 }
             }.onFailure { exception ->
                 when (exception) {
-                    is ApiController.NetworkException -> {
+                    is NetworkException -> {
                         mailboxContentRealm.executeRealmCallbacks(realmActionsOnDraft)
                         throw exception
                     }

app/src/standard/java/com/infomaniak/mail/firebase/RegisterUserDeviceWorker.kt

@@ -20,7 +20,7 @@ package com.infomaniak.mail.firebase
 import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.*
-import com.infomaniak.lib.core.api.ApiController
+import com.infomaniak.lib.core.api.ApiController.NetworkException
 import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.di.IoDispatcher
@@ -62,7 +62,7 @@ class RegisterUserDeviceWorker @AssistedInject constructor(
                 runCatching {
                     apiResponse.throwErrorAsException()
                 }.onFailure { exception ->
-                    if (exception !is ApiController.NetworkException) Sentry.captureException(exception)
+                    if (exception !is NetworkException) Sentry.captureException(exception)
                     SentryLog.w(TAG, "launchWork: register ${user.id} failed", exception)
                     return@withContext Result.retry()
                 }