Resolved #6469 - solved check server connection errors on Android

This commit is contained in:
Yair Morgenstern 2022-03-31 23:36:42 +03:00
parent 73b6ee9af0
commit 5876047bda
2 changed files with 3 additions and 4 deletions

View File

@ -4,7 +4,7 @@ Changed server connection to URL-based to allow connection to uncivserver.xyz
By xlenstra:
- Added a unique for attacking when embarked
- Typed denmarks unique and generalized it
- Generalized Denmark's unique
By HaneulCheong:
- Improved city name generation

View File

@ -264,7 +264,6 @@ class OptionsPopup(val previousScreen: BaseScreen) : Popup(previousScreen) {
else "https://..."
val multiplayerServerTextField = TextField(textToShowForMultiplayerAddress, BaseScreen.skin)
multiplayerServerTextField.programmaticChangeEvents = true
multiplayerServerTextField.width = screen.stage.width / 2
val serverIpTable = Table()
serverIpTable.add("Server address".toLabel().onClick {
@ -275,7 +274,7 @@ class OptionsPopup(val previousScreen: BaseScreen) : Popup(previousScreen) {
settings.save()
connectionToServerButton.isEnabled = multiplayerServerTextField.text != Constants.dropboxMultiplayerServer
}
serverIpTable.add(multiplayerServerTextField)
serverIpTable.add(multiplayerServerTextField).width(screen.stage.width / 2)
add(serverIpTable).row()
add("Reset to Dropbox".toTextButton().onClick {
@ -316,7 +315,7 @@ class OptionsPopup(val previousScreen: BaseScreen) : Popup(previousScreen) {
with(URL(url).openConnection() as HttpURLConnection) {
requestMethod = method // default is GET
doOutput = true
if (method != Net.HttpMethods.GET) doOutput = true
try {
if (content.isNotEmpty()) {