fixes and improvements

2025-03-21 02:35:57 +03:00
parent 2c8536a9da
commit 797e966b65
9 changed files with 81 additions and 31 deletions
@@ -134,6 +134,7 @@ class ConversationsViewModelImpl(
    }

    override fun onRefresh() {
+        baseError.setValue { null }
        loadConversations(offset = 0)
    }

@@ -273,17 +274,7 @@ class ConversationsViewModelImpl(
        conversationsUseCase.getConversations(count = LOAD_COUNT, offset = offset)
            .listenValue(viewModelScope) { state ->
                state.processState(
-                    error = { error ->
-                        if (error is State.Error.ApiError) {
-                            when (error.errorCode) {
-                                VkErrorCode.USER_AUTHORIZATION_FAILED -> {
-                                    baseError.setValue { BaseError.SessionExpired }
-                                }
-
-                                else -> Unit
-                            }
-                        }
-                    },
+                    error = ::handleError,
                    success = { response ->
                        val itemsCountSufficient = response.size == LOAD_COUNT
                        canPaginate.setValue { itemsCountSufficient }
@@ -339,6 +330,40 @@ class ConversationsViewModelImpl(
            }
    }

+    private fun handleError(error: State.Error) {
+        when (error) {
+            is State.Error.ApiError -> {
+                when (error.errorCode) {
+                    VkErrorCode.USER_AUTHORIZATION_FAILED -> {
+                        baseError.setValue { BaseError.SessionExpired }
+                    }
+
+                    else -> {
+                        baseError.setValue {
+                            BaseError.SimpleError(message = error.errorMessage)
+                        }
+                    }
+                }
+            }
+            State.Error.ConnectionError -> {
+                baseError.setValue {
+                    BaseError.SimpleError(message = "Connection error")
+                }
+            }
+            State.Error.InternalError -> {
+                baseError.setValue {
+                    BaseError.SimpleError(message = "Internal error")
+                }
+            }
+            State.Error.UnknownError -> {
+                baseError.setValue {
+                    BaseError.SimpleError(message = "Unknown error")
+                }
+            }
+            else -> Unit
+        }
+    }
+
    private fun deleteConversation(peerId: Int) {
        conversationsUseCase.delete(peerId).listenValue(viewModelScope) { state ->
            state.processState(
@@ -339,12 +339,24 @@ fun ConversationsScreen(
        }
    ) { padding ->
        when {
-            baseError is BaseError.SessionExpired -> {
-                ErrorView(
-                    text = "Session expired",
-                    buttonText = "Log out",
-                    onButtonClick = onSessionExpiredLogOutButtonClicked
-                )
+            baseError != null -> {
+                when (baseError) {
+                    is BaseError.SessionExpired -> {
+                        ErrorView(
+                            text = "Session expired",
+                            buttonText = "Log out",
+                            onButtonClick = onSessionExpiredLogOutButtonClicked
+                        )
+                    }
+
+                    is BaseError.SimpleError -> {
+                        ErrorView(
+                            text = baseError.message,
+                            buttonText = "Try again",
+                            onButtonClick = onRefresh
+                        )
+                    }
+                }
            }

            screenState.isLoading && screenState.conversations.isEmpty() -> FullScreenLoader()