app/src/main/java/com/geekorum/ttrss/accounts/LoginViewModel.kt
changeset 225 6453fa194908
parent 145 bbbc6890407d
child 245 7d798eca63b7
--- a/app/src/main/java/com/geekorum/ttrss/accounts/LoginViewModel.kt	Sun Jun 02 21:54:27 2019 -0700
+++ b/app/src/main/java/com/geekorum/ttrss/accounts/LoginViewModel.kt	Mon Jun 03 00:51:42 2019 -0700
@@ -85,6 +85,7 @@
         val invalidUrlMsgId = when {
             text.isEmpty() -> R.string.error_field_required
             httpUrl == null -> R.string.error_invalid_http_url
+            httpUrl?.pathSegments()?.last()?.isNotEmpty() == true -> R.string.error_http_url_must_end_wish_slash
             else -> null
         }
         fieldErrors.value = current.copy(invalidUrlMsgId = invalidUrlMsgId, hasEditUrl = true)
@@ -235,7 +236,10 @@
         @JvmStatic
         @InverseMethod("convertHttpUrlToString")
         fun convertStringToHttpUrl(url: String): HttpUrl? {
-            return HttpUrl.parse(url)
+            return HttpUrl.parse(url)?.newBuilder() // remove fragment and query
+                ?.query(null)
+                ?.encodedFragment(null)
+                ?.build()
         }
 
         @JvmStatic