From 306e69ff3a575ca1506ed8eaace506b30cb57f50 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 2 Sep 2023 11:47:04 +0000
Subject: [PATCH] Fix book load (#24)

* update gradle to 8.1.0

* fix book load

use http headers of the latest official app version

---------

Co-authored-by: linsui <linsui555@gmail.com>
---
 .idea/compiler.xml                                          | 2 +-
 .idea/gradle.xml                                            | 2 +-
 .idea/kotlinc.xml                                           | 6 ++++++
 .idea/misc.xml                                              | 2 +-
 app/build.gradle                                            | 1 +
 app/src/main/AndroidManifest.xml                            | 5 ++---
 .../java/top/fumiama/copymanga/tools/http/DownloadTools.kt  | 6 ++++--
 .../main/java/top/fumiama/copymanga/ui/book/BookHandler.kt  | 2 +-
 app/src/main/res/values/strings.xml                         | 5 +++--
 build.gradle                                                | 2 +-
 gradle.properties                                           | 5 ++++-
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 12 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7b46144..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..b1077fb
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f6605c4..ea75bfb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -56,7 +56,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 99432e3..fe7a41e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,6 +48,7 @@ android {
             enableSplit = false
         }
     }
+    namespace 'top.fumiama.dmzj.copymanga'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3dab9ac..874fccc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="top.fumiama.dmzj.copymanga">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -47,4 +46,4 @@
             android:theme="@style/AppTheme.NoActionBar"/>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt b/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt
index b0c1182..24f169f 100644
--- a/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt
+++ b/app/src/main/java/top/fumiama/copymanga/tools/http/DownloadTools.kt
@@ -28,15 +28,17 @@ object DownloadTools {
                         setRequestProperty("region", if(!getBoolean("settings_cat_net_sw_use_foreign", false)) "1" else "0")
                     }
                     it.getPreferences(Context.MODE_PRIVATE).apply {
-                        setRequestProperty("version", getString("app_ver", "1.4.4"))
+                        setRequestProperty("version", getString("app_ver", "2.0.7"))
                         getString("token", "")?.let {
                             if(it != "") setRequestProperty("authorization", "Token $it")
-                            else setRequestProperty("authorization", "Token")
+                            else setRequestProperty("authorization", "Token ")
                         }
                     }
                 }
                 setRequestProperty("platform", "3")
             }
+            Log.d("Mydl", "getHttp: ${connection.getRequestProperties().map({ "${it.key}: ${it.value}" }).joinToString("\n")}")
+            connection
         }
 
     private fun getNormalConnection(url: String?, method: String = "GET", ua: String? = null) =
diff --git a/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt b/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt
index a3fb9d2..691dc6c 100644
--- a/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt
+++ b/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt
@@ -362,4 +362,4 @@ class BookHandler(private val th: WeakReference<BookFragment>, private val path:
         }
         vols = volumes
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e3889c..88b00a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,8 +61,9 @@
     <string name="TRANSPORT_LOWPAN">LOWPAN</string>
     <string name="TRANSPORT_NULL">无网络</string>
 
-    <string name="pc_ua">Dart/2.16 (dart:io)</string>
-    <string name="app_ver">1.4.4</string>
+    <string name="pc_ua">COPY/2.0.7</string>
+    <string name="app_ver">2.0.7</string>
+    <string name="referer">com.copymanga.app-2.0.7</string>
 
     <string name="menu_update_time">更新时间</string>
     <string name="menu_hot">热度</string>
diff --git a/build.gradle b/build.gradle
index 828834d..15b7302 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 98ee989..4ab6d5d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.enableR8.fullMode=true
\ No newline at end of file
+android.enableR8.fullMode=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d5ef843..bcbaca3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip