Skip to content

Commit 15aaf24

Browse files
authored
Merge pull request #406 from YangSen-qn/releases/7.x
solve null point problem
2 parents 23fca5a + fab8989 commit 15aaf24

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#Changelog
2+
# 7.6.6
3+
* 修复部分空指针异常
4+
25
# 7.6.5
36
* 优化Dns local cache
47

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ https://github.com/qiniudemo/qiniu-lab-android
2525
| 7.0.7 | Android 2.2+ | android-async-http 1.4.8 |
2626

2727
### 注意
28-
* 推荐使用最新版:7.6.5
28+
* 推荐使用最新版:7.6.6
2929
* AndroidNetwork.getMobileDbm()可以获取手机信号强度,需要如下权限(API>=18时生效)
3030
```
3131
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

library/src/main/java/com/qiniu/android/common/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
public final class Constants {
5-
public static final String VERSION = "7.6.5";
5+
public static final String VERSION = "7.6.6";
66

77
public static final String UTF_8 = "utf-8";
88
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ private Long[] recoveryFromRecord() {
561561
long modify = obj.optLong("modify_time", 0);
562562
long fSize = obj.optLong("size", 0);
563563
JSONArray array = obj.optJSONArray("contexts");
564-
if (offsetsArray.length() == 0 || modify != modifyTime || fSize != totalSize || array == null || array.length() == 0) {
564+
if (offsetsArray == null || offsetsArray.length() == 0 || modify != modifyTime || fSize != totalSize || array == null || array.length() == 0) {
565565
return null;
566566
}
567567
for (int i = 0; i < array.length(); i++) {

0 commit comments

Comments
 (0)