feat(android_sidebar): refine the code

Author: Theo-lbg

xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressRepository.kt

@@ -206,30 +206,61 @@ class WordpressRepository(
     suspend fun updatePassword(
         editPassword: UserEditPassword
     ): UpdatePasswordResult {
+        var updatePasswordResult: UpdatePasswordResult = UpdatePasswordResult.NetworkError
+
         handleServiceExceptions(
             tryBody = {
                 val result = api.updatePassword(editPassword)
-                when (result.code()) {
-                    NO_CONTENT -> return UpdatePasswordResult.Success
-                    INTERNAL_SERVER_ERROR -> result.errorBody()?.string()?.let {
-                        if (it.contains("incorrect_password")) {
-                            Log.d("WordpressRepository: updatePasswordIncorrectInitialPassword", "Incorrect initial password")
-                            return UpdatePasswordResult.IncorrectInitialPassword
-                        }
-                        if (it.contains("password_mismatch")) {
-                            Log.d("WordpressRepository: updatePasswordPasswordMismatch", "Password mismatch")
-                            return UpdatePasswordResult.PasswordMismatch
+                updatePasswordResult = when (result.code()) {
+                    NO_CONTENT -> UpdatePasswordResult.Success
+                    INTERNAL_SERVER_ERROR -> {
+                        val errorBody = result.errorBody()?.string()
+                        when {
+                            errorBody?.contains("incorrect_password") == true -> {
+                                Log.d(
+                                    "WordpressRepository: updatePasswordIncorrectInitialPassword",
+                                    "Incorrect initial password"
+                                )
+                                UpdatePasswordResult.IncorrectInitialPassword
+                            }
+
+                            errorBody?.contains("password_mismatch") == true -> {
+                                Log.d(
+                                    "WordpressRepository: updatePasswordPasswordMismatch",
+                                    "Password mismatch"
+                                )
+                                UpdatePasswordResult.PasswordMismatch
+                            }
+
+                            else -> {
+                                Log.e(
+                                    "WordpressRepository: updatePasswordUnknownError",
+                                    "Unknown error: ${result.code()}"
+                                )
+                                UpdatePasswordResult.NetworkError
+                            }
                         }
                     }
+
+                    else -> {
+                        Log.e(
+                            "WordpressRepository: updatePasswordUnknownError",
+                            "Unknown error: ${result.code()}"
+                        )
+                        UpdatePasswordResult.NetworkError
+                    }
                 }
-                Log.e("WordpressRepository: updatePasswordUnknownError", "Unknown error: ${result.code()}")
-                return UpdatePasswordResult.NetworkError
             },
             catchBody = {
-                Log.e("WordpressRepository: updatePasswordNetworkError", "Network error: ${it.message}")
-                return UpdatePasswordResult.NetworkError
+                Log.e(
+                    "WordpressRepository: updatePasswordNetworkError",
+                    "Network error: ${it.message}"
+                )
+                updatePasswordResult = UpdatePasswordResult.NetworkError
             }
         )
+
+        return updatePasswordResult
     }
 
     // Exceptions handling

xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfilePage.kt

@@ -25,10 +25,16 @@ fun ProfilePage(
     ) {
         if (isChangingPassword) {
             ProfileEditPasswordView(
-                onComplete = { isChangingPassword = false }
-            )
+                onComplete = {
+                    isChangingPassword = false
+                })
         } else {
-            ProfileUserInfosView(onClickToAccessPasswordEdition = { isChangingPassword = true }, navigationController = navigationController)
+            ProfileUserInfosView(
+                onClickToAccessPasswordEdition = {
+                    isChangingPassword = true
+                },
+                navigationController = navigationController
+            )
         }
     }
 }

xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/viewModel/user/UserInfosViewModel.kt

@@ -15,7 +15,7 @@ import com.xpeho.xpeapp.ui.uiState.PasswordUpdateUiState
 import com.xpeho.xpeapp.ui.uiState.UserInfosUiState
 import kotlinx.coroutines.launch
 
-class UserInfosViewModel (
+class UserInfosViewModel(
     private val wordpressRepo: WordpressRepository,
     private val authManager: AuthenticationManager
 ) : ViewModel() {
@@ -35,7 +35,8 @@ class UserInfosViewModel (
 
                 val result = wordpressRepo.fetchUserInfos()
                 if (result == null) {
-                    UserInfosUiState.ERROR("Oups, il y a eu un problème dans le chargement des informations utilisateur")
+                    UserInfosUiState.ERROR("Oups, il y a eu un problème dans " +
+                            "le chargement des informations utilisateur")
                 } else {
                     UserInfosUiState.SUCCESS(result)
                 }
@@ -46,22 +47,30 @@ class UserInfosViewModel (
     }
 
     fun updatePassword(editPassword: UserEditPassword) {
-    passwordUpdateState = PasswordUpdateUiState.LOADING
-    viewModelScope.launch {
-        try {
-            val result = wordpressRepo.updatePassword(editPassword)
-            passwordUpdateState = when (result) {
-                is UpdatePasswordResult.Success -> PasswordUpdateUiState.SUCCESS
-                is UpdatePasswordResult.IncorrectInitialPassword -> PasswordUpdateUiState.ERROR("Le mot de passe initial est incorrect.")
-                is UpdatePasswordResult.PasswordMismatch -> PasswordUpdateUiState.ERROR("Les mots de passe ne correspondent pas.")
-                else -> PasswordUpdateUiState.ERROR("La mise à jour du mot de passe a échoué.")
-}
-            Log.d("UserInfosVIewmodle", "updatePassword: $passwordUpdateState")
-        } catch (e: Exception) {
-            passwordUpdateState = PasswordUpdateUiState.ERROR("Oups, il y a eu un problème dans la mise à jour du mot de passe")
+        passwordUpdateState = PasswordUpdateUiState.LOADING
+        viewModelScope.launch {
+            try {
+                val result = wordpressRepo.updatePassword(editPassword)
+                passwordUpdateState = when (result) {
+                    is UpdatePasswordResult.Success -> PasswordUpdateUiState.SUCCESS
+                    is UpdatePasswordResult.IncorrectInitialPassword ->
+                        PasswordUpdateUiState.ERROR("Le mot de passe initial est incorrect.")
+
+                    is UpdatePasswordResult.PasswordMismatch ->
+                        PasswordUpdateUiState.ERROR("Les mots de passe ne correspondent pas.")
+
+                    else ->
+                        PasswordUpdateUiState.ERROR("La mise à jour du mot de passe a échoué.")
+                }
+                Log.d("UserInfosViewModel", "updatePassword: $passwordUpdateState")
+            } catch (e: Exception) {
+                Log.e("UserInfosViewModel", "Exception during password update", e)
+                passwordUpdateState = PasswordUpdateUiState.ERROR(
+                    "Oups, il y a eu un problème dans la mise à jour du mot de passe"
+                )
+            }
         }
     }
-}
 
 
     fun resetPasswordUpdateState() {