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

temporary disable domian jid sanity check

Browse source
This commit is contained in:
kosyak 2023-12-17 23:54:58 +01:00
parent 7f7e4b10a4
commit 73bc3c2617
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

@ -574,7 +574,6 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
this.binding.mucJid.setText(mConversation.getJid().asBareJid().toEscapedString()); this.binding.mucJid.setText(mConversation.getJid().asBareJid().toEscapedString());
binding.mucJid.setOnClickListener(v -> ShareUtil.copyJidToClipboard(ConferenceDetailsActivity.this, mConversation.getJid().asBareJid())); binding.mucJid.setOnClickListener(v -> ShareUtil.copyJidToClipboard(ConferenceDetailsActivity.this, mConversation.getJid().asBareJid()));
if (printableValue(subject)) { if (printableValue(subject)) {
SpannableStringBuilder spannable = new SpannableStringBuilder(subject); SpannableStringBuilder spannable = new SpannableStringBuilder(subject);
StylingHelper.format(spannable, this.binding.mucSubject.getCurrentTextColor()); StylingHelper.format(spannable, this.binding.mucSubject.getCurrentTextColor());

4
src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
View file

@ -264,12 +264,12 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
} }
if (!issuedWarning && sanityCheckJid != SanityCheck.NO) { if (!issuedWarning && sanityCheckJid != SanityCheck.NO) {
if (contactJid.isDomainJid()) { /*if (contactJid.isDomainJid()) {
binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_a_domain)); binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_a_domain));
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway); dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);
issuedWarning = true; issuedWarning = true;
return; return;
} } */
if (sanityCheckJid != SanityCheck.ALLOW_MUC && suspiciousSubDomain(contactJid.getDomain().toEscapedString())) { if (sanityCheckJid != SanityCheck.ALLOW_MUC && suspiciousSubDomain(contactJid.getDomain().toEscapedString())) {
binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_channel)); binding.jidLayout.setError(getActivity().getString(R.string.this_looks_like_channel));
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway); dialog.getButton(AlertDialog.BUTTON_POSITIVE).setText(R.string.add_anway);