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

fixed bug where one couldnt short click to edit in the account list

Browse source
This commit is contained in:
Daniel Gultsch 2014-03-13 04:32:19 +01:00
parent 6db012ac6f
commit eec3906692
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/strings.xml
View file

@ -24,4 +24,5 @@
<string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string> <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string>
<string name="untrusted_cert_hint">The server %s presented you with an unstrusted, possible self signed, certificate.</string> <string name="untrusted_cert_hint">The server %s presented you with an unstrusted, possible self signed, certificate.</string>
<string name="account_info">Server Info</string> <string name="account_info">Server Info</string>
<string name="register_account">Register new account on server</string>
</resources> </resources>

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

@ -65,9 +65,10 @@ public class EditAccount extends DialogFragment {
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);
builder.setTitle("Add account"); builder.setTitle(getString(R.string.register_account));
okButtonDesc = "Register"; okButtonDesc = "Register";
passwordConfirm.setVisibility(View.VISIBLE); passwordConfirm.setVisibility(View.VISIBLE);
passwordConfirm.setText(account.getPassword());
} else { } else {
registerAccount.setVisibility(View.GONE); registerAccount.setVisibility(View.GONE);
builder.setTitle("Edit account"); builder.setTitle("Edit account");
@ -88,10 +89,12 @@ public class EditAccount extends DialogFragment {
Button positiveButton = (Button) d Button positiveButton = (Button) d
.getButton(Dialog.BUTTON_POSITIVE); .getButton(Dialog.BUTTON_POSITIVE);
if (isChecked) { if (isChecked) {
d.setTitle(getString(R.string.register_account));
positiveButton.setText("Register"); positiveButton.setText("Register");
passwordConfirm.setVisibility(View.VISIBLE); passwordConfirm.setVisibility(View.VISIBLE);
confirmPwDesc.setVisibility(View.VISIBLE); confirmPwDesc.setVisibility(View.VISIBLE);
} else { } else {
d.setTitle("Add account");
passwordConfirm.setVisibility(View.GONE); passwordConfirm.setVisibility(View.GONE);
positiveButton.setText("Add"); positiveButton.setText("Add");
confirmPwDesc.setVisibility(View.GONE); confirmPwDesc.setVisibility(View.GONE);