third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-16 09:20:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/server-address' into 'develop'

Browse Source 
Fixed server editor to remove invalid spaces and slashes from the end of the address

See merge request ultrasonic/ultrasonic!896
This commit is contained in:
Nite 2023-01-02 20:02:18 +00:00
commit dd8766d1ef
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt
View File

@ -186,6 +186,10 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
.setBottomSpace(DIALOG_PADDING)
.show()
}
serverAddressEditText?.editText?.setOnFocusChangeListener { _, hasFocus ->
if (!hasFocus) correctServerAddress()
}
}
override fun onStop() {
@ -193,6 +197,12 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
super.onStop()
}
private fun correctServerAddress() {
serverAddressEditText?.editText?.setText(
serverAddressEditText?.editText?.text?.trim(' ', '/')
)
}
private fun updateColor(color: Int?) {
val image = ContextCompat.getDrawable(requireContext(), R.drawable.thumb_drawable)
currentColor = color ?: ServerColor.getBackgroundColor(requireContext(), null)
@ -296,6 +306,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
isValid = false
} else {
try {
correctServerAddress()
val urlString = serverAddressEditText!!.editText?.text.toString()
url = URL(urlString)
if (