Skip to content

Commit 46d1707

Browse files
author
JemyCheung
committed
repair zone
1 parent 918432b commit 46d1707

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ public static String resultCode(int statuscode) {
556556

557557
public static String errorType(int statuscode) {
558558
String result = "";
559-
if (200 < statuscode && statuscode < 400) {
559+
if (200 < statuscode && statuscode < 600) {
560560
return "response_error";
561561
}
562562
switch (statuscode) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private void setTarget_region_id(ZoneInfo info) {
128128
DnsPrefetcher.target_region_id = "z0";
129129
} else if (info.upDomainsList.contains(FixedZone.arrayzone1[0])) {
130130
DnsPrefetcher.target_region_id = "z1";
131-
} else if (info.upDomainsList.contains(FixedZone.arrayzone1[0])) {
131+
} else if (info.upDomainsList.contains(FixedZone.arrayzone2[0])) {
132132
DnsPrefetcher.target_region_id = "z2";
133133
} else if (info.upDomainsList.contains(FixedZone.arrayZoneAs0[0])) {
134134
DnsPrefetcher.target_region_id = "as0";

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.0";
5+
public static final String VERSION = "7.6.1";
66

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

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,18 @@ public final class FixedZone extends Zone {
6565
};
6666
public static final Zone zoneAs0 = new FixedZone(arrayZoneAs0);
6767

68-
private static ZoneInfo zoneInfo;
69-
private static List<ZoneInfo> listZoneInfo = new ArrayList<ZoneInfo>();
68+
private ZoneInfo zoneInfo;
69+
private static ZoneInfo preCustomZone;
7070

7171
public static List<ZoneInfo> getZoneInfos() {
72+
List<ZoneInfo> listZoneInfo = new ArrayList<ZoneInfo>();
7273
listZoneInfo.add(createZoneInfo(arrayzone0));
7374
listZoneInfo.add(createZoneInfo(arrayzone1));
7475
listZoneInfo.add(createZoneInfo(arrayzone2));
7576
listZoneInfo.add(createZoneInfo(arrayzoneNa0));
7677
listZoneInfo.add(createZoneInfo(arrayZoneAs0));
77-
listZoneInfo.add(zoneInfo);
78+
if (preCustomZone != null)
79+
listZoneInfo.add(preCustomZone);
7880
return listZoneInfo;
7981
}
8082

@@ -84,6 +86,7 @@ public FixedZone(ZoneInfo zoneInfo) {
8486

8587
public FixedZone(String[] upDomains) {
8688
this.zoneInfo = createZoneInfo(upDomains);
89+
this.preCustomZone = this.zoneInfo;
8790
}
8891

8992
public static ZoneInfo createZoneInfo(String[] upDomains) {

0 commit comments

Comments
 (0)