Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Release 1.1.2

This commit is contained in:
Vavassor 2017-04-13 17:14:43 -04:00
parent f5fd17ac66
commit 18d5d0152c
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "com.keylesspalace.tusky" applicationId "com.keylesspalace.tusky"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 14 versionCode 15
versionName "1.1.1" versionName "1.1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary true vectorDrawables.useSupportLibrary true
} }

23
app/src/main/java/com/keylesspalace/tusky/OkHttpUtils.java
View File

@ -88,14 +88,27 @@ class OkHttpUtils {
if (Build.VERSION.SDK_INT != Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT != Build.VERSION_CODES.N) {
return; return;
} }
SSLContext sslContext; SSLSocketFactory socketFactory;
try { try {
sslContext = SSLContext.getInstance("TLS"); TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
} catch (NoSuchAlgorithmException e) { TrustManagerFactory.getDefaultAlgorithm());
Log.e(TAG, "Failed obtaining TLS Context."); trustManagerFactory.init((KeyStore) null);
TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
throw new IllegalStateException("Unexpected default trust managers:"
+ Arrays.toString(trustManagers));
}
X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(null, new TrustManager[] { trustManager }, null);
socketFactory = sslContext.getSocketFactory();
} catch (NoSuchAlgorithmException|KeyStoreException|KeyManagementException e) {
Log.e(TAG, "Failed obtaining the SSL socket factory.");
return; return;
} }
String[] cipherSuites = sslContext.getSocketFactory().getDefaultCipherSuites(); String[] cipherSuites = socketFactory.getDefaultCipherSuites();
ArrayList<String> allowedList = new ArrayList<>(); ArrayList<String> allowedList = new ArrayList<>();
for (String suite : cipherSuites) { for (String suite : cipherSuites) {
if (!suite.contains("ECDH")) { if (!suite.contains("ECDH")) {