Shrink url validation
This commit is contained in:
@@ -83,7 +83,7 @@ internal class LoginActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun doCheckUrl() {
|
private fun doCheckUrl() {
|
||||||
var url = binding.gotifyUrl.text.toString()
|
val url = binding.gotifyUrl.text.toString().trim().trimEnd('/')
|
||||||
val parsedUrl = HttpUrl.parse(url)
|
val parsedUrl = HttpUrl.parse(url)
|
||||||
if (parsedUrl == null) {
|
if (parsedUrl == null) {
|
||||||
Utils.showSnackBar(this, "Invalid URL (include http:// or https://)")
|
Utils.showSnackBar(this, "Invalid URL (include http:// or https://)")
|
||||||
@@ -97,9 +97,6 @@ internal class LoginActivity : AppCompatActivity() {
|
|||||||
binding.checkurlProgress.visibility = View.VISIBLE
|
binding.checkurlProgress.visibility = View.VISIBLE
|
||||||
binding.checkurl.visibility = View.GONE
|
binding.checkurl.visibility = View.GONE
|
||||||
|
|
||||||
url = url.trim()
|
|
||||||
if (url.endsWith("/")) url.dropLast(1)
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ClientFactory.versionApi(url, tempSslSettings())
|
ClientFactory.versionApi(url, tempSslSettings())
|
||||||
.version
|
.version
|
||||||
|
|||||||
Reference in New Issue
Block a user