sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use unescaped jid in ManageAccount

This commit is contained in:
Daniel Gultsch 2020-05-15 20:20:22 +02:00
parent dc29cf27a3
commit 78a82a74bc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java
View File

@ -131,7 +131,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(false); menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(false);
menu.findItem(R.id.mgmt_account_publish_avatar).setVisible(false); menu.findItem(R.id.mgmt_account_publish_avatar).setVisible(false);
} }
menu.setHeaderTitle(this.selectedAccount.getJid().asBareJid().toString()); menu.setHeaderTitle(this.selectedAccount.getJid().asBareJid().toEscapedString());
} }
@Override @Override

2
src/main/java/eu/siacs/conversations/services/NotificationService.java
View File

@ -1109,7 +1109,7 @@ public class NotificationService {
return; return;
} else if (errors.size() == 1) { } else if (errors.size() == 1) {
mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.problem_connecting_to_account)); mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.problem_connecting_to_account));
mBuilder.setContentText(errors.get(0).getJid().asBareJid().toString()); mBuilder.setContentText(errors.get(0).getJid().asBareJid().toEscapedString());
} else { } else {
mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.problem_connecting_to_accounts)); mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.problem_connecting_to_accounts));
mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_fix)); mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_fix));

4
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View File

@ -577,9 +577,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
protected boolean jidEdited() { protected boolean jidEdited() {
final String unmodified; final String unmodified;
if (mUsernameMode) { if (mUsernameMode) {
unmodified = this.mAccount.getJid().getLocal(); unmodified = this.mAccount.getJid().getEscapedLocal();
} else { } else {
unmodified = this.mAccount.getJid().asBareJid().toString(); unmodified = this.mAccount.getJid().asBareJid().toEscapedString();
} }
return !unmodified.equals(this.binding.accountJid.getText().toString()); return !unmodified.equals(this.binding.accountJid.getText().toString());
} }