From 01ae7e2e5fd92dae7f48944f2789449a609d27b9 Mon Sep 17 00:00:00 2001
From: AriaLyy <511455842@qq.com>
Date: Wed, 18 Jan 2017 09:43:41 +0800
Subject: [PATCH] ..
---
.idea/misc.xml | 2 +-
.../com/arialyy/aria/util/SSLContextUtil.java | 17 ++++++++++++++++-
.../simple/single_task/SingleTaskActivity.java | 7 -------
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb68289..5d199810 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/Aria/src/main/java/com/arialyy/aria/util/SSLContextUtil.java b/Aria/src/main/java/com/arialyy/aria/util/SSLContextUtil.java
index b17da02e..af40e0de 100644
--- a/Aria/src/main/java/com/arialyy/aria/util/SSLContextUtil.java
+++ b/Aria/src/main/java/com/arialyy/aria/util/SSLContextUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.arialyy.aria.util;
import android.text.TextUtils;
@@ -38,7 +53,7 @@ public class SSLContextUtil {
* @param caPath 保存在assets目录下的CA证书完整路径
*/
public static SSLContext getSSLContext(String caAlias, String caPath) {
- if (TextUtils.isEmpty(caAlias) || TextUtils.isEmpty(caPath)){
+ if (TextUtils.isEmpty(caAlias) || TextUtils.isEmpty(caPath)) {
return null;
}
// Load CAs from an InputStream
diff --git a/app/src/main/java/com/arialyy/simple/single_task/SingleTaskActivity.java b/app/src/main/java/com/arialyy/simple/single_task/SingleTaskActivity.java
index 10da33dd..82d62924 100644
--- a/app/src/main/java/com/arialyy/simple/single_task/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/single_task/SingleTaskActivity.java
@@ -119,11 +119,6 @@ public class SingleTaskActivity extends BaseActivity {
mStart.setText("重新开始?");
mCancel.setEnabled(false);
setBtState(true);
-
- //String path = Environment.getExternalStorageDirectory().getPath() + "/test.jpg";
- //Bitmap bm = BitmapFactory.decodeFile(path);
- //mImg.setImageBitmap(bm);
-
break;
}
}
@@ -201,8 +196,6 @@ public class SingleTaskActivity extends BaseActivity {
.load(DOWNLOAD_URL)
.setDownloadPath(Environment.getExternalStorageDirectory().getPath() + "/test.apk")
.setDownloadName("test.apk")
- //.setDownloadPath(Environment.getExternalStorageDirectory().getPath() + "/test.jpg")
- //.setDownloadName("test.jpg")
.start();
}