Skip to content

Commit fa8165b

Browse files
committed
add UpToken.isInvalid [ci skip]
1 parent 45f6bd1 commit fa8165b

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

library/src/main/java/com/qiniu/android/collect/UploadInfoCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void run() {
197197
singleServer.submit(taskRecord);
198198

199199
// 少几次上传没有影响
200-
if (Config.isUpload && upToken != null && upToken != UpToken.NULL) {
200+
if (Config.isUpload && !UpToken.isInvalid(upToken)) {
201201
Runnable taskUpload = new Runnable() {
202202
@Override
203203
public void run() {

library/src/main/java/com/qiniu/android/storage/UpToken.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public static UpToken parse(String token) {
4949
return new UpToken(obj.optString("returnUrl"), token, t[0]);
5050
}
5151

52+
public static boolean isInvalid(UpToken token) {
53+
return token == null || token == NULL;
54+
}
55+
5256
public String toString() {
5357
return token;
5458
}

library/src/main/java/com/qiniu/android/storage/UploadManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static boolean areInvalidArg(final String key, byte[] data, File f, Stri
5555
ResponseInfo info = null;
5656
if (message != null) {
5757
info = ResponseInfo.invalidArgument(message, decodedToken);
58-
} else if (decodedToken == UpToken.NULL || decodedToken == null) {
58+
} else if (UpToken.isInvalid(decodedToken)) {
5959
info = ResponseInfo.invalidToken("invalid token");
6060
} else if ((f != null && f.length() == 0) || (data != null && data.length == 0)) {
6161
info = ResponseInfo.zeroSize(decodedToken);
@@ -82,7 +82,7 @@ private static ResponseInfo areInvalidArg(final String key, byte[] data, File f,
8282
return ResponseInfo.invalidArgument(message, decodedToken);
8383
}
8484

85-
if (decodedToken == UpToken.NULL || decodedToken == null) {
85+
if (UpToken.isInvalid(decodedToken)) {
8686
return ResponseInfo.invalidToken("invalid token");
8787
}
8888

0 commit comments

Comments
 (0)