diff options
| author | Rene Treffer <treffer@measite.de> | 2014-04-03 21:22:17 +0200 |
|---|---|---|
| committer | Rene Treffer <treffer@measite.de> | 2014-04-03 21:22:17 +0200 |
| commit | 56848492496f5f8ccb044ce75bb5889e5b93170c (patch) | |
| tree | 9261384298d8eaa68da3a4be21ecee1458255f19 | |
| parent | e6797e1db4282459d86f78698ed84caf0ce6aba3 (diff) | |
Remove option to enable/disable TLS (now enabled by default)
| -rw-r--r-- | res/layout/edit_account_dialog.xml | 9 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/EditAccount.java | 5 |
2 files changed, 1 insertions, 13 deletions
diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml index 453b15d9..0a86039d 100644 --- a/res/layout/edit_account_dialog.xml +++ b/res/layout/edit_account_dialog.xml @@ -42,15 +42,6 @@ android:hint="Password" android:fontFamily="sans-serif" /> - - - <CheckBox - android:id="@+id/account_usetls" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Use Transport Layer Security (TLS)" - android:checked="true"/> - <CheckBox android:id="@+id/edit_account_register_new" android:layout_width="wrap_content" diff --git a/src/eu/siacs/conversations/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java index 2bb57133..46f4ecfa 100644 --- a/src/eu/siacs/conversations/ui/EditAccount.java +++ b/src/eu/siacs/conversations/ui/EditAccount.java @@ -43,7 +43,6 @@ public class EditAccount extends DialogFragment { final EditText jidText = (EditText) view.findViewById(R.id.account_jid); final TextView confirmPwDesc = (TextView) view .findViewById(R.id.account_confirm_password_desc); - final CheckBox useTLS = (CheckBox) view.findViewById(R.id.account_usetls); final EditText password = (EditText) view .findViewById(R.id.account_password); @@ -57,7 +56,6 @@ public class EditAccount extends DialogFragment { if (account != null) { jidText.setText(account.getJid()); password.setText(account.getPassword()); - useTLS.setChecked(account.isOptionSet(Account.OPTION_USETLS)); Log.d("xmppService","mein debugger. account != null"); if (account.isOptionSet(Account.OPTION_REGISTER)) { registerAccount.setChecked(true); @@ -117,7 +115,6 @@ public class EditAccount extends DialogFragment { EditText passwordEdit = (EditText) d .findViewById(R.id.account_password); String password = passwordEdit.getText().toString(); - CheckBox useTLS = (CheckBox) d.findViewById(R.id.account_usetls); CheckBox register = (CheckBox) d.findViewById(R.id.edit_account_register_new); String username; String server; @@ -136,7 +133,7 @@ public class EditAccount extends DialogFragment { } else { account = new Account(username, server, password); } - account.setOption(Account.OPTION_USETLS, useTLS.isChecked()); + account.setOption(Account.OPTION_USETLS, true); account.setOption(Account.OPTION_USECOMPRESSION, true); account.setOption(Account.OPTION_REGISTER, register.isChecked()); if (listener != null) { |