narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Remove option to enable/disable TLS (now enabled by default)

Browse source
This commit is contained in:
Rene Treffer 2014-04-03 21:22:17 +02:00
parent e6797e1db4
commit 5684849249
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
res/layout/edit_account_dialog.xml
View file

@ -42,15 +42,6 @@
android:hint="Password" android:hint="Password"
android:fontFamily="sans-serif" /> 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 <CheckBox
android:id="@+id/edit_account_register_new" android:id="@+id/edit_account_register_new"
android:layout_width="wrap_content" android:layout_width="wrap_content"

5
src/eu/siacs/conversations/ui/EditAccount.java
View file

@ -43,7 +43,6 @@ public class EditAccount extends DialogFragment {
final EditText jidText = (EditText) view.findViewById(R.id.account_jid); final EditText jidText = (EditText) view.findViewById(R.id.account_jid);
final TextView confirmPwDesc = (TextView) view final TextView confirmPwDesc = (TextView) view
.findViewById(R.id.account_confirm_password_desc); .findViewById(R.id.account_confirm_password_desc);
final CheckBox useTLS = (CheckBox) view.findViewById(R.id.account_usetls);
final EditText password = (EditText) view final EditText password = (EditText) view
.findViewById(R.id.account_password); .findViewById(R.id.account_password);
@ -57,7 +56,6 @@ public class EditAccount extends DialogFragment {
if (account != null) { if (account != null) {
jidText.setText(account.getJid()); jidText.setText(account.getJid());
password.setText(account.getPassword()); password.setText(account.getPassword());
useTLS.setChecked(account.isOptionSet(Account.OPTION_USETLS));
Log.d("xmppService","mein debugger. account != null"); Log.d("xmppService","mein debugger. account != null");
if (account.isOptionSet(Account.OPTION_REGISTER)) { if (account.isOptionSet(Account.OPTION_REGISTER)) {
registerAccount.setChecked(true); registerAccount.setChecked(true);
@ -117,7 +115,6 @@ public class EditAccount extends DialogFragment {
EditText passwordEdit = (EditText) d EditText passwordEdit = (EditText) d
.findViewById(R.id.account_password); .findViewById(R.id.account_password);
String password = passwordEdit.getText().toString(); 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); CheckBox register = (CheckBox) d.findViewById(R.id.edit_account_register_new);
String username; String username;
String server; String server;
@ -136,7 +133,7 @@ public class EditAccount extends DialogFragment {
} else { } else {
account = new Account(username, server, password); 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_USECOMPRESSION, true);
account.setOption(Account.OPTION_REGISTER, register.isChecked()); account.setOption(Account.OPTION_REGISTER, register.isChecked());
if (listener != null) { if (listener != null) {