Merge pull request #30 from chenxiaolong/ranges

UpdaterThread: Check for Content-Range instead of Accept-Ranges
chenxiaolong · Dec 22, 2023 · c242197 · c242197
2 parents 0e30ad0 + 983158a
commit c242197
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/src/main/java/com/chiller3/custota/updater/UpdaterThread.kt b/app/src/main/java/com/chiller3/custota/updater/UpdaterThread.kt
@@ -249,16 +249,21 @@ class UpdaterThread(
 
             PartialFdInputStream(pfd, pf.offset, pf.size)
         } else {
+            val range = "${pf.offset}-${pf.offset + pf.size - 1}"
+
             val connection = openUrl(URL(uri.toString()))
-            connection.setRequestProperty("Range", "bytes=${pf.offset}-${pf.offset + pf.size - 1}")
+            connection.setRequestProperty("Range", "bytes=$range")
             connection.connect()
 
             if (connection.responseCode / 100 != 2) {
                 throw IOException("Got ${connection.responseCode} (${connection.responseMessage}) for $uri")
             }
 
-            if (connection.getHeaderField("Accept-Ranges") != "bytes") {
-                throw IOException("Server does not support byte ranges")
+            val responseRange = connection.getHeaderField("Content-Range")
+                ?: throw IOException("Server does not support byte ranges")
+
+            if (responseRange.split('/').firstOrNull() != "bytes $range") {
+                throw IOException("Response range ($responseRange) does not match request ($range)")
             }
 
             if (connection.contentLengthLong != pf.size) {