tt/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除androidx、support依赖，现在哪个版本的appcompat库都可以导入Aria

Browse Source 
修复一个在xml中使用fragment导致的内存泄漏问题
This commit is contained in:
laoyuyu
2019-12-08 11:08:58 +08:00
parent 3871d8f056
commit d9ed7f87d2
45 changed files with 98 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PublicComponent/src/main/java/com/arialyy/aria/util/SSLContextUtil.java
View File

@@ -56,8 +56,7 @@ public class SSLContextUtil {
* @param caPath 保存在assets目录下的CA证书完整路径
* @param protocol 连接协议
*/
public static SSLContext getSSLContextFromAssets(String caAlias, String caPath,
@ProtocolType String protocol) {
public static SSLContext getSSLContextFromAssets(String caAlias, String caPath, String protocol) {
if (TextUtils.isEmpty(caAlias) || TextUtils.isEmpty(caPath)) {
return null;
}
@@ -83,8 +82,7 @@ public class SSLContextUtil {
* @param caPath CA证书路径
* @param protocol 连接协议
*/
public static SSLContext getSSLContext(String caAlias, String caPath,
@ProtocolType String protocol) {
public static SSLContext getSSLContext(String caAlias, String caPath, String protocol) {
if (TextUtils.isEmpty(caAlias) || TextUtils.isEmpty(caPath)) {
return null;
}
@@ -105,8 +103,8 @@ public class SSLContextUtil {
/**
* @param cacheKey 别名 + 证书路径，然后取md5
*/
private static SSLContext createContext(String caAlias, Certificate ca,
@ProtocolType String protocol, String cacheKey) {
private static SSLContext createContext(String caAlias, Certificate ca, String protocol,
String cacheKey) {
try {
String keyStoreType = KeyStore.getDefaultType();
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
@@ -154,7 +152,7 @@ public class SSLContextUtil {
/**
* 服务器证书不是由 CA 签署的，而是自签署时，获取默认的SSL
*/
public static SSLContext getDefaultSLLContext(@ProtocolType String protocol) {
public static SSLContext getDefaultSLLContext(String protocol) {
SSLContext sslContext = null;
try {
sslContext =