fix(feat/coolapk): fix coolapk download

DUpdateSystem · Jul 3, 2022 · 4679518 · 4679518
1 parent 5eb09f2
commit 4679518
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/app/src/main/res/layout/item_hub_app_update.xml b/app/src/main/res/layout/item_hub_app_update.xml
@@ -62,6 +62,7 @@
                 android:background="@drawable/bg_update_btn"
                 android:onClick="@{(view) -> handler.clickDownload(item.app, view)}"
                 android:text="@string/update"
+                android:textSize="12sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
diff --git a/core-websdk/build.gradle b/core-websdk/build.gradle
@@ -48,6 +48,7 @@ dependencies {
 
     // OkHttp
     api 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10'
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection:5.0.0-alpha.10'
     // dom4j, xml support
     implementation 'org.dom4j:dom4j:2.1.3'
     // markdown support

diff --git a/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/hubs/CoolApk.kt b/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/hubs/CoolApk.kt
@@ -105,12 +105,12 @@ internal class CoolApk(
                 ?: return null
             return listOf(
                 DownloadItem(
-                    newAssets.fileName, newAssets.downloadUrl ?: return null, headerMap, null
+                    newAssets.fileName, newAssets.downloadUrl ?: return null, null, null
                 )
             )
         } else {
             Log.i(logObjectTag, TAG, "getDownload: 网址验证正确")
-            return listOf(DownloadItem(assetGson.fileName, request.url.toString(), headerMap, null))
+            return listOf(DownloadItem(assetGson.fileName, request.url.toString(), null, null))
         }
     }
 

diff --git a/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/web/http/OkHttpApi.kt b/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/web/http/OkHttpApi.kt
@@ -4,12 +4,11 @@ import net.xzos.upgradeall.core.utils.log.Log
 import net.xzos.upgradeall.core.utils.log.ObjectTag
 import net.xzos.upgradeall.core.utils.log.msg
 import okhttp3.*
-import okhttp3.FormBody
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONObject
 import java.io.IOException
+import java.net.CookieManager
 import java.util.concurrent.TimeUnit
 
 
@@ -20,6 +19,7 @@ class OkHttpApi internal constructor() {
     }
 
     private val client = OkHttpClient().newBuilder()
+        .cookieJar(cookieJar)
         .dispatcher(dispatcher)
         .callTimeout(15, TimeUnit.SECONDS)
         .connectTimeout(15, TimeUnit.SECONDS)
@@ -86,6 +86,8 @@ class OkHttpApi internal constructor() {
     companion object {
         private const val TAG = "OkHttpApi"
 
+        private val cookieJar = JavaNetCookieJar(CookieManager())
+
         fun callHttpFunc(objectTag: ObjectTag, url: String, core: () -> Response): Response? {
             return try {
                 core()