diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
index 4cb914a4..5383d6d1 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
@@ -235,7 +235,7 @@ internal class EditServerActivity : AppCompatActivity() {
* Checks whether any value in the fields are changed according to their original values.
*/
private fun areFieldsChanged(): Boolean {
- if (currentServerSetting == null) {
+ if (currentServerSetting == null || currentServerSetting!!.id == -1) {
return !serverNameEditText!!.editText?.text!!.isBlank() ||
serverAddressEditText!!.editText?.text.toString() != "http://" ||
!userNameEditText!!.editText?.text!!.isBlank() ||
diff --git a/ultrasonic/src/main/res/layout/server_edit.xml b/ultrasonic/src/main/res/layout/server_edit.xml
index a8f32ccc..1058c3f6 100644
--- a/ultrasonic/src/main/res/layout/server_edit.xml
+++ b/ultrasonic/src/main/res/layout/server_edit.xml
@@ -14,7 +14,7 @@
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/settings.server_name"
- app:layout_constraintBottom_toTopOf="@+id/edit_server_address"
+ app:layout_constraintBottom_toTopOf="@id/edit_server_address"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -33,10 +33,10 @@
a:layout_height="wrap_content"
a:layout_marginBottom="20dp"
a:hint="@string/settings.server_address"
- app:layout_constraintBottom_toTopOf="@+id/edit_authentication_header"
+ app:layout_constraintBottom_toTopOf="@id/edit_authentication_header"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/edit_server_name">
+ app:layout_constraintTop_toBottomOf="@id/edit_server_name">
+ app:layout_constraintBottom_toTopOf="@id/edit_server_username"
+ app:layout_constraintStart_toStartOf="@id/edit_server_username"
+ app:layout_constraintTop_toBottomOf="@id/edit_server_address" />
+ app:layout_constraintTop_toBottomOf="@id/edit_authentication_header">
+ app:layout_constraintTop_toBottomOf="@id/edit_server_username">
+ app:layout_constraintTop_toBottomOf="@id/edit_server_password" />
+ app:layout_constraintTop_toBottomOf="@id/edit_advanced_header" />
+ app:layout_constraintTop_toBottomOf="@id/edit_advanced_header" />
+ app:layout_constraintTop_toBottomOf="@id/edit_self_signed" />
+ app:layout_constraintTop_toBottomOf="@id/edit_ldap_title" />
+ app:layout_constraintTop_toTopOf="@id/edit_ldap_title" />
+ app:layout_constraintTop_toBottomOf="@id/edit_ldap_description" />
+ app:layout_constraintTop_toBottomOf="@id/edit_ldap_description" />
@@ -213,14 +213,13 @@
a:id="@+id/edit_save"
style="?attr/materialButtonOutlinedStyle"
a:layout_width="0dp"
- a:layout_height="wrap_content"
- a:layout_marginTop="8dp"
+ a:layout_height="0dp"
a:text="@string/common.save"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintBottom_toBottomOf="@id/edit_test"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/edit_test"
- app:layout_constraintTop_toBottomOf="@id/edit_jukebox"
- app:layout_constraintVertical_bias="1.0" />
+ app:layout_constraintStart_toEndOf="@id/edit_test"
+ app:layout_constraintTop_toTopOf="@id/edit_test" />
+
\ No newline at end of file