0
0
mirror of https://github.com/markusfisch/BinaryEye.git synced 2024-09-20 03:52:16 +02:00

Add query parameter to back-end URL if necessary

This commit is contained in:
Markus Fisch 2021-01-17 21:19:08 +01:00
parent 9aecf0d83b
commit e1905b1ff2

View File

@ -36,7 +36,7 @@ class UrlDialogFragment : PreferenceDialogFragmentCompat() {
}
}
private fun getUrl() = decorate(urlView?.text.toString())
private fun getUrl() = completeUrl(urlView?.text.toString())
private fun urlPreference() = preference as UrlPreference
@ -79,10 +79,18 @@ class UrlDialogFragment : PreferenceDialogFragmentCompat() {
}
}
private fun decorate(url: String) = url.trim().also {
return if (it.isEmpty() || it.startsWith("http")) {
it
} else {
"http://${it}"
private fun completeUrl(template: String): String {
var s = template.trim()
if (s.isEmpty()) {
return ""
}
if (!s.startsWith("http")) {
s = "http://${s}"
}
if (prefs.sendScanType == "0" &&
!s.matches(".*/[a-zA-Z._-]*\\?[a-zA-Z0-9_-]+=$".toRegex())
) {
s = "${s}?content="
}
return s
}