mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Attempt to workaround Android 7.0 cipher problem" 

This reverts commit e4aca7a432.
This commit is contained in:
M66B 2023-11-08 10:08:48 +01:00
parent 093bb89c5e
commit decf811114
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/EmailService.java
View File

@ -1290,17 +1290,6 @@ public class EmailService implements AutoCloseable {
sslSocket.setEnabledCipherSuites(ciphers.toArray(new String[0]));
}
// https://issuetracker.google.com/issues/37122132
// https://stackoverflow.com/questions/39133437/sslhandshakeexception-handshake-failed-on-android-n-7-0
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N) {
List<String> ciphers = new ArrayList<>();
for (String cipher : sslSocket.getEnabledCipherSuites())
if (cipher != null && !cipher.endsWith("SHA384"))
ciphers.add(cipher);
if (ciphers.size() > 0)
sslSocket.setEnabledCipherSuites(ciphers.toArray(new String[0]));
}
Log.i("SSL protocols=" + TextUtils.join(",", sslSocket.getEnabledProtocols()));
Log.i("SSL ciphers=" + TextUtils.join(",", sslSocket.getEnabledCipherSuites()));
}