Merge branch 'master' of YangSen-qn:qiniu/android-sdk

# Conflicts: # library/src/main/java/com/qiniu/android/common/AutoZone.java # library/src/main/java/com/qiniu/android/common/Config.java # library/src/main/java/com/qiniu/android/common/Zone.java # library/src/main/java/com/qiniu/android/common/ZoneInfo.java # library/src/main/java/com/qiniu/android/http/ResponseInfo.java # library/src/main/java/com/qiniu/android/http/dns/DnsPrefetchTransaction.java # library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java # library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java # library/src/main/java/com/qiniu/android/storage/Configuration.java
YangSen-qn · May 24, 2024 · 78cea59 · 78cea59
2 parents 0b32ed1 + 37e573e
commit 78cea59
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
@@ -0,0 +1,20 @@
+name: Android SDK Version Check
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+jobs:
+  linux:
+    name: Version Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
+      - name: Check
+        run: |
+          set -e
+          grep -qF "## ${RELEASE_VERSION}" CHANGELOG.md
+          grep -qF "${RELEASE_VERSION}" README.md
+          grep -qF "public static final String VERSION = \"${RELEASE_VERSION}\";" library/src/main/java/com/qiniu/android/common/Constants.java
diff --git a/library/src/main/java/com/qiniu/android/common/AutoZone.java b/library/src/main/java/com/qiniu/android/common/AutoZone.java
@@ -258,7 +258,9 @@ private String makeCacheKey(Configuration configuration, String akAndBucket) {
 
     private RequestTransaction createUploadRequestTransaction(Configuration configuration, UpToken token) {
         List<String> hosts = getUcServerList();
-
+        if (configuration == null) {
+            configuration = new Configuration.Builder().build();
+        }
         RequestTransaction transaction = new RequestTransaction(configuration, null,
                 hosts, ZoneInfo.EmptyRegionId, null, token);
         transactions.add(transaction);

diff --git a/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java b/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java
@@ -129,7 +129,7 @@ private void initData(IUploadRegion targetRegion,
                           IUploadRegion currentRegion) {
 
         this.requestState = new UploadRequestState();
-        this.requestState.setCouldUseHttp3(config.requestClient != null);
+        this.requestState.setCouldUseHttp3(config != null && config.requestClient != null);
         this.requestInfo = new UploadRequestInfo();
         this.requestInfo.targetRegionId = targetRegion.getZoneInfo().getRegionId();
         this.requestInfo.currentRegionId = currentRegion.getZoneInfo().getRegionId();