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

SASL: don't prefer PLAIN auth over DIGEST-MD5 for nimbuzz.com

Browse source
This commit is contained in:
Daniel Gultsch 2017-11-05 16:21:59 +01:00
parent 8f0cd86090
commit 435d1ef5bd
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/ui/widget/ZeroWidthSpan.java Normal file
View file

@ -0,0 +1,10 @@
package eu.siacs.conversations.ui.widget;
import android.text.style.ReplacementSpan;
/**
* Created by daniel on 11/4/17.
*/
public class ZeroWidthSpan extends ReplacementSpan {
}

2
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -896,7 +896,7 @@ public class XmppConnection implements Runnable {
saslMechanism = new ScramSha256(tagWriter, account, mXmppConnectionService.getRNG()); saslMechanism = new ScramSha256(tagWriter, account, mXmppConnectionService.getRNG());
} else if (mechanisms.contains("SCRAM-SHA-1")) { } else if (mechanisms.contains("SCRAM-SHA-1")) {
saslMechanism = new ScramSha1(tagWriter, account, mXmppConnectionService.getRNG()); saslMechanism = new ScramSha1(tagWriter, account, mXmppConnectionService.getRNG());
} else if (mechanisms.contains("PLAIN")) { } else if (mechanisms.contains("PLAIN") && !account.getJid().getDomainpart().equals("nimbuzz.com")) {
saslMechanism = new Plain(tagWriter, account); saslMechanism = new Plain(tagWriter, account);
} else if (mechanisms.contains("DIGEST-MD5")) { } else if (mechanisms.contains("DIGEST-MD5")) {
saslMechanism = new DigestMd5(tagWriter, account, mXmppConnectionService.getRNG()); saslMechanism = new DigestMd5(tagWriter, account, mXmppConnectionService.getRNG());