diff options
| author | Rene Treffer <treffer@measite.de> | 2014-04-03 20:54:50 +0200 |
|---|---|---|
| committer | Rene Treffer <treffer@measite.de> | 2014-04-03 20:54:50 +0200 |
| commit | e6797e1db4282459d86f78698ed84caf0ce6aba3 (patch) | |
| tree | 3670c4d776ee1fd952c1d9be0f7eb9f418e52c05 | |
| parent | 7db21136a3221beccdddf6c94ecf1303a6be986a (diff) | |
Remove option for compression (enabled by default / hidden setting)
| -rw-r--r-- | res/layout/edit_account_dialog.xml | 7 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/EditAccount.java | 6 |
2 files changed, 1 insertions, 12 deletions
diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml index cc29b6f91..453b15d9b 100644 --- a/res/layout/edit_account_dialog.xml +++ b/res/layout/edit_account_dialog.xml @@ -52,13 +52,6 @@ android:checked="true"/> <CheckBox - android:id="@+id/account_usecompression" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Use Compression (zlib)" - android:checked="true"/> - - <CheckBox android:id="@+id/edit_account_register_new" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/eu/siacs/conversations/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java index cdebec549..2bb57133a 100644 --- a/src/eu/siacs/conversations/ui/EditAccount.java +++ b/src/eu/siacs/conversations/ui/EditAccount.java @@ -45,8 +45,6 @@ public class EditAccount extends DialogFragment { .findViewById(R.id.account_confirm_password_desc); final CheckBox useTLS = (CheckBox) view.findViewById(R.id.account_usetls); - final CheckBox useCompression = (CheckBox) view.findViewById(R.id.account_usecompression); - final EditText password = (EditText) view .findViewById(R.id.account_password); final EditText passwordConfirm = (EditText) view @@ -60,7 +58,6 @@ public class EditAccount extends DialogFragment { jidText.setText(account.getJid()); password.setText(account.getPassword()); useTLS.setChecked(account.isOptionSet(Account.OPTION_USETLS)); - useCompression.setChecked(account.isOptionSet(Account.OPTION_USETLS)); Log.d("xmppService","mein debugger. account != null"); if (account.isOptionSet(Account.OPTION_REGISTER)) { registerAccount.setChecked(true); @@ -121,7 +118,6 @@ public class EditAccount extends DialogFragment { .findViewById(R.id.account_password); String password = passwordEdit.getText().toString(); CheckBox useTLS = (CheckBox) d.findViewById(R.id.account_usetls); - CheckBox useCompression = (CheckBox) d.findViewById(R.id.account_usecompression); CheckBox register = (CheckBox) d.findViewById(R.id.edit_account_register_new); String username; String server; @@ -141,7 +137,7 @@ public class EditAccount extends DialogFragment { account = new Account(username, server, password); } account.setOption(Account.OPTION_USETLS, useTLS.isChecked()); - account.setOption(Account.OPTION_USECOMPRESSION, useCompression.isChecked()); + account.setOption(Account.OPTION_USECOMPRESSION, true); account.setOption(Account.OPTION_REGISTER, register.isChecked()); if (listener != null) { listener.onAccountEdited(account); |