diff options
| author | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
| commit | df63c14617bc8d665bfeac62cde0b29e6aa98873 (patch) | |
| tree | b825c0c87bcd9833ecfad85ecc5c0901ea4d77eb /src/main/java/eu/siacs/conversations/http/HttpConnection.java | |
| parent | 87e56b534ad41199380c97e16ad25acbd077878c (diff) | |
| parent | e17b75511e7c9d8206939b742972021c5c9d6b86 (diff) | |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http/HttpConnection.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpConnection.java b/src/main/java/eu/siacs/conversations/http/HttpConnection.java index 4bff5251..e7d30919 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpConnection.java @@ -148,7 +148,7 @@ public class HttpConnection implements Downloadable { mXmppConnectionService.getRNG()); final SSLSocketFactory sf = sc.getSocketFactory(); - final String[] cipherSuites = CryptoHelper.getSupportedCipherSuites( + final String[] cipherSuites = CryptoHelper.getOrderedCipherSuites( sf.getSupportedCipherSuites()); if (cipherSuites.length > 0) { sc.getDefaultSSLParameters().setCipherSuites(cipherSuites); |