Update Linkding bad request handling

fibelatti · Dec 22, 2024 · 4fba36d · 4fba36d
1 parent aefe0be
commit 4fba36d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/core/di/modules/LinkdingModule.kt b/app/src/main/kotlin/com/fibelatti/pinboard/core/di/modules/LinkdingModule.kt
@@ -44,6 +44,8 @@ object LinkdingModule {
             accept(ContentType.Application.Json)
         }
 
+        expectSuccess = true
+
         install(unauthorizedPluginProvider.plugin)
     }
 }
diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/EditPostViewModel.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/EditPostViewModel.kt
@@ -15,6 +15,8 @@ import com.fibelatti.pinboard.features.posts.domain.usecase.AddPost
 import com.fibelatti.pinboard.features.posts.domain.usecase.InvalidUrlException
 import com.fibelatti.pinboard.features.tags.domain.model.Tag
 import dagger.hilt.android.lifecycle.HiltViewModel
+import io.ktor.client.plugins.ClientRequestException
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -34,7 +36,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.flow.withIndex
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @HiltViewModel
 class EditPostViewModel @Inject constructor(
@@ -111,7 +112,7 @@ class EditPostViewModel @Inject constructor(
                         currentState.copy(isLoading = false)
                     }
                     when (error) {
-                        is InvalidUrlException -> {
+                        is InvalidUrlException, is ClientRequestException -> {
                             _screenState.update { currentState ->
                                 currentState.copy(
                                     invalidUrlError = resourceProvider.getString(R.string.validation_error_invalid_url),

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -130,7 +130,7 @@
 
     <!-- Validation -->
     <string name="validation_error_empty_url">The URL cannot be empty</string>
-    <string name="validation_error_invalid_url">The URL is invalid</string>
+    <string name="validation_error_invalid_url">The URL is not accepted by the service</string>
     <string name="validation_error_invalid_url_rationale">The URL could not be saved. Please verify that it is valid</string>
     <string name="validation_error_empty_title">The title cannot be empty</string>