This commit is contained in:
@ -18,9 +18,11 @@ package com.arialyy.aria.core.download;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
import android.text.TextUtils;
|
||||
import com.arialyy.aria.core.inf.AbsNormalEntity;
|
||||
import com.arialyy.aria.core.inf.AbsTaskEntity;
|
||||
import com.arialyy.aria.orm.Primary;
|
||||
import com.arialyy.aria.util.CommonUtil;
|
||||
|
||||
/**
|
||||
* Created by lyy on 2015/12/25.
|
||||
@ -66,7 +68,7 @@ public class DownloadEntity extends AbsNormalEntity implements Parcelable {
|
||||
}
|
||||
|
||||
public String getDisposition() {
|
||||
return disposition;
|
||||
return TextUtils.isEmpty(disposition) ? "" : CommonUtil.decryptBASE64(disposition);
|
||||
}
|
||||
|
||||
public void setDisposition(String disposition) {
|
||||
|
@ -31,6 +31,7 @@ import java.io.File;
|
||||
public class DownloadTarget
|
||||
extends AbsDownloadTarget<DownloadTarget, DownloadEntity, DownloadTaskEntity> {
|
||||
protected String url;
|
||||
|
||||
DownloadTarget(DownloadEntity entity, String targetName) {
|
||||
this(entity.getUrl(), targetName);
|
||||
}
|
||||
@ -88,7 +89,6 @@ public class DownloadTarget
|
||||
super.setHighestPriority();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下载任务是否存在
|
||||
*/
|
||||
@ -126,10 +126,17 @@ public class DownloadTarget
|
||||
return this;
|
||||
}
|
||||
|
||||
private DownloadEntity getDownloadEntity() {
|
||||
public DownloadEntity getDownloadEntity() {
|
||||
return mEntity;
|
||||
}
|
||||
|
||||
/**
|
||||
* 从header中获取文件描述信息
|
||||
*/
|
||||
public String getContentDisposition() {
|
||||
return mEntity.getDisposition();
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否在下载
|
||||
*/
|
||||
|
@ -84,7 +84,7 @@ class HttpFileInfoThread implements Runnable {
|
||||
String disposition = conn.getHeaderField(mTaskEntity.dispositionKey);
|
||||
//Map<String, List<String>> headers = conn.getHeaderFields();
|
||||
if (!TextUtils.isEmpty(disposition)) {
|
||||
mEntity.setDisposition(disposition);
|
||||
mEntity.setDisposition(CommonUtil.encryptBASE64(disposition));
|
||||
if (disposition.contains(mTaskEntity.dispositionFileKey)) {
|
||||
String[] infos = disposition.split("=");
|
||||
mEntity.setServerFileName(URLDecoder.decode(infos[1], "utf-8"));
|
||||
|
@ -21,6 +21,7 @@ import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.net.Uri;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Base64;
|
||||
import android.util.Log;
|
||||
import com.arialyy.aria.core.AriaManager;
|
||||
import com.arialyy.aria.core.command.normal.NormalCmdFactory;
|
||||
@ -45,7 +46,6 @@ import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
@ -64,6 +64,26 @@ import java.lang.reflect.WildcardType;
|
||||
public class CommonUtil {
|
||||
private static final String TAG = "CommonUtil";
|
||||
|
||||
/**
|
||||
* base64 解密字符串
|
||||
*
|
||||
* @param str 被加密的字符串
|
||||
* @return 解密后的字符串
|
||||
*/
|
||||
public static String decryptBASE64(String str) {
|
||||
return new String(Base64.decode(str.getBytes(), Base64.DEFAULT));
|
||||
}
|
||||
|
||||
/**
|
||||
* base64 加密字符串
|
||||
*
|
||||
* @param str 需要加密的字符串
|
||||
* @return 加密后的字符串
|
||||
*/
|
||||
public static String encryptBASE64(String str) {
|
||||
return Base64.encodeToString(str.getBytes(), Base64.DEFAULT);
|
||||
}
|
||||
|
||||
/**
|
||||
* 字符串编码转换
|
||||
*/
|
||||
|
Reference in New Issue
Block a user