fix: 修复枝网查重无法使用

This commit is contained in:
HuanCheng65 2022-06-26 20:55:30 +08:00
parent 867d47fa59
commit 587f770531
No known key found for this signature in database
GPG Key ID: E9031EF91A805148
3 changed files with 91 additions and 10 deletions

View File

@ -18,6 +18,11 @@ object CheckApi {
.addConverterFactory(GsonConverterFactory.create())
.client(OkHttpClient.Builder().apply {
connectionPool(connectionPool)
sslSocketFactory(
SSLSocketClient.getSSLSocketFactory(),
SSLSocketClient.getX509TrustManager()
)
hostnameVerifier(SSLSocketClient.getHostnameVerifier())
}.build())
.build()
.create(ICheckApi::class.java)

View File

@ -0,0 +1,70 @@
package com.huanchengfly.tieba.post.plugins.asoulcnki.api;
import java.security.KeyStore;
import java.security.SecureRandom;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
public class SSLSocketClient {
//获取这个SSLSocketFactory
public static SSLSocketFactory getSSLSocketFactory() {
try {
SSLContext sslContext = SSLContext.getInstance("SSL");
sslContext.init(null, getTrustManager(), new SecureRandom());
return sslContext.getSocketFactory();
} catch (Exception e) {
throw new RuntimeException(e);
}
}
//获取TrustManager
private static TrustManager[] getTrustManager() {
return new TrustManager[]{
new X509TrustManager() {
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType) {
}
@Override
public void checkServerTrusted(X509Certificate[] chain, String authType) {
}
@Override
public X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[]{};
}
}
};
}
//获取HostnameVerifier
public static HostnameVerifier getHostnameVerifier() {
return (s, sslSession) -> true;
}
public static X509TrustManager getX509TrustManager() {
X509TrustManager trustManager = null;
try {
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
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));
}
trustManager = (X509TrustManager) trustManagers[0];
} catch (Exception e) {
e.printStackTrace();
}
return trustManager;
}
}

View File

@ -86,7 +86,13 @@ object EmotionManager {
contextRef = WeakReference(context)
val emotionCache = getEmotionDataCache()
if (emotionCache.ids.isEmpty()) {
for (i in 1..137) {
for (i in 1..50) {
emotionIds.add("image_emoticon$i")
}
for (i in 61..101) {
emotionIds.add("image_emoticon$i")
}
for (i in 125..137) {
emotionIds.add("image_emoticon$i")
}
} else {
@ -129,18 +135,18 @@ object EmotionManager {
}
fun getEmotionCacheDir(): File {
return File(getContext().externalCacheDir ?: getContext().cacheDir, "emotion")
return File(getContext().externalCacheDir ?: getContext().cacheDir, "emotion").apply {
if (exists() && isFile) {
delete()
mkdirs()
} else if (!exists()) {
mkdirs()
}
}
}
fun getEmotionFile(id: String): File {
val emotionsCacheDir = getEmotionCacheDir()
if (emotionsCacheDir.exists() && emotionsCacheDir.isFile) {
emotionsCacheDir.delete()
emotionsCacheDir.mkdirs()
} else if (!emotionsCacheDir.exists()) {
emotionsCacheDir.mkdirs()
}
return File(emotionsCacheDir, "$id.png")
return File(getEmotionCacheDir(), "$id.png")
}
fun getEmotionIdByName(name: String): String? {