k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
pull/1155/head
gedoor 3 years ago
parent 538d40822e 5cf2ebd463
commit 72524a9022
17 changed files with 35 additions and 62 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/assets/web/bookshelf/css/about.1cd9ab87.css
  2. BIN
      app/src/main/assets/web/bookshelf/favicon.ico
  3. BIN
      app/src/main/assets/web/bookshelf/img/icons/favicon-16x16.png
  4. BIN
      app/src/main/assets/web/bookshelf/img/icons/favicon-32x32.png
  5. 41
      app/src/main/assets/web/bookshelf/index.html
  6. 1
      app/src/main/assets/web/bookshelf/js/about.517e59ea.js
  7. 1
      app/src/main/assets/web/bookshelf/js/about.a53813f7.js
  8. 1
      app/src/main/assets/web/bookshelf/js/about~detail.8270a871.js
  9. 1
      app/src/main/assets/web/bookshelf/js/about~detail.d5f6fddf.js
  10. 2
      app/src/main/assets/web/bookshelf/js/app.fd005031.js
  11. 1
      app/src/main/assets/web/bookshelf/js/detail.133910b4.js
  12. 1
      app/src/main/assets/web/bookshelf/js/detail.2147373a.js
  13. 26
      app/src/main/assets/web/bookshelf/precache-manifest.1be475b0fa464f5fe47e53b13d56bc1a.js
  14. 2
      app/src/main/assets/web/bookshelf/service-worker.js
  15. 4
      app/src/main/java/io/legado/app/help/AppConfig.kt
  16. 7
      app/src/main/java/io/legado/app/help/http/cronet/CronetHelper.kt
  17. 7
      app/src/main/res/xml/network_security_config.xml

2
app/src/main/assets/web/bookshelf/css/about.dbe575e1.css → app/src/main/assets/web/bookshelf/css/about.1cd9ab87.css
View File

File diff suppressed because one or more lines are too long

BIN
app/src/main/assets/web/bookshelf/favicon.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
app/src/main/assets/web/bookshelf/img/icons/favicon-16x16.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 799 B

BIN
app/src/main/assets/web/bookshelf/img/icons/favicon-32x32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

41
app/src/main/assets/web/bookshelf/index.html
Unescape View File

@ -1,40 +1,3 @@
<!DOCTYPE html> <!DOCTYPE html><html lang="en" style="padding: 0;height:100%"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="favicon.ico" /><![endif]--><title>Legado Bookshelf</title><link href="css/about.1cd9ab87.css" rel="prefetch"><link href="css/detail.e03dc50b.css" rel="prefetch"><link href="js/about.a53813f7.js" rel="prefetch"><link href="js/about~detail.8270a871.js" rel="prefetch"><link href="js/detail.2147373a.js" rel="prefetch"><link href="css/app.e4c919b7.css" rel="preload" as="style"><link href="css/chunk-vendors.8a465a1d.css" rel="preload" as="style"><link href="js/app.fd005031.js" rel="preload" as="script"><link href="js/chunk-vendors.3ef7796f.js" rel="preload" as="script"><link href="css/chunk-vendors.8a465a1d.css" rel="stylesheet"><link href="css/app.e4c919b7.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="img/icons/favicon-16x16.png"><link rel="manifest" href="manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="yd-web-tool"><link rel="apple-touch-icon" href="img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><style>body::-webkit-scrollbar {
<html lang="en" style="padding: 0;height:100%">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>Legado Bookshelf</title>
<link href="css/about.dbe575e1.css" rel="prefetch">
<link href="css/detail.e03dc50b.css" rel="prefetch">
<link href="js/about.517e59ea.js" rel="prefetch">
<link href="js/about~detail.d5f6fddf.js" rel="prefetch">
<link href="js/detail.133910b4.js" rel="prefetch">
<link href="css/app.e4c919b7.css" rel="preload" as="style">
<link href="css/chunk-vendors.8a465a1d.css" rel="preload" as="style">
<link href="js/app.b53a207e.js" rel="preload" as="script">
<link href="js/chunk-vendors.3ef7796f.js" rel="preload" as="script">
<link href="css/chunk-vendors.8a465a1d.css" rel="stylesheet">
<link href="css/app.e4c919b7.css" rel="stylesheet">
<link rel="manifest" href="manifest.json">
<meta name="theme-color" content="#4DBA87">
<meta name="apple-mobile-web-app-capable" content="no">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<meta name="apple-mobile-web-app-title" content="yd-web-tool">
<link rel="apple-touch-icon" href="img/icons/apple-touch-icon-152x152.png">
<link rel="mask-icon" href="img/icons/safari-pinned-tab.svg" color="#4DBA87">
<meta name="msapplication-TileImage" content="img/icons/msapplication-icon-144x144.png">
<meta name="msapplication-TileColor" content="#000000">
</head>
<style>body::-webkit-scrollbar {
display: none; display: none;
} }</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.3ef7796f.js"></script><script src="js/app.fd005031.js"></script></body></html>
</style>
<body style="margin: 0;height:100%">
<noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled.
Please enable it to continue.</strong></noscript>
<div id="app"></div>
<script src="js/chunk-vendors.3ef7796f.js"></script>
<script src="js/app.b53a207e.js"></script>
</body>
</html>

1
app/src/main/assets/web/bookshelf/js/about.517e59ea.js
View File

File diff suppressed because one or more lines are too long

1
app/src/main/assets/web/bookshelf/js/about.a53813f7.js
View File

File diff suppressed because one or more lines are too long

1
app/src/main/assets/web/bookshelf/js/about~detail.8270a871.js
View File

File diff suppressed because one or more lines are too long

1
app/src/main/assets/web/bookshelf/js/about~detail.d5f6fddf.js
View File

File diff suppressed because one or more lines are too long

2
app/src/main/assets/web/bookshelf/js/app.b53a207e.js → app/src/main/assets/web/bookshelf/js/app.fd005031.js
View File

File diff suppressed because one or more lines are too long

1
app/src/main/assets/web/bookshelf/js/detail.133910b4.js
View File

File diff suppressed because one or more lines are too long

1
app/src/main/assets/web/bookshelf/js/detail.2147373a.js
View File

File diff suppressed because one or more lines are too long

26
app/src/main/assets/web/bookshelf/precache-manifest.04173d48a716bddd6fb159c907ea23ec.js → app/src/main/assets/web/bookshelf/precache-manifest.1be475b0fa464f5fe47e53b13d56bc1a.js
Unescape View File

@ -1,10 +1,10 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([ self.__precacheManifest = (self.__precacheManifest || []).concat([
{ {
"revision": "8d9fdb8415d07e6ccb43", "revision": "cba8f50059529470d85c",
"url": "css/about.dbe575e1.css" "url": "css/about.1cd9ab87.css"
}, },
{ {
"revision": "21fa37c7c5f599610e4a", "revision": "541d582d52204c074e10",
"url": "css/app.e4c919b7.css" "url": "css/app.e4c919b7.css"
}, },
{ {
@ -12,7 +12,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "css/chunk-vendors.8a465a1d.css" "url": "css/chunk-vendors.8a465a1d.css"
}, },
{ {
"revision": "f125263b13dcf9460fac", "revision": "d60be8c4b24801df7253",
"url": "css/detail.e03dc50b.css" "url": "css/detail.e03dc50b.css"
}, },
{ {
@ -40,28 +40,28 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "img/noCover.b5c48bc1.jpeg" "url": "img/noCover.b5c48bc1.jpeg"
}, },
{ {
"revision": "a62c375778d5252b73301bc267956812", "revision": "45fde37aeed7eeacbb2c404196962348",
"url": "index.html" "url": "index.html"
}, },
{ {
"revision": "8d9fdb8415d07e6ccb43", "revision": "cba8f50059529470d85c",
"url": "js/about.517e59ea.js" "url": "js/about.a53813f7.js"
}, },
{ {
"revision": "6fb055833dc45d74e12c", "revision": "5998ccb313ed338c15e1",
"url": "js/about~detail.d5f6fddf.js" "url": "js/about~detail.8270a871.js"
}, },
{ {
"revision": "21fa37c7c5f599610e4a", "revision": "541d582d52204c074e10",
"url": "js/app.b53a207e.js" "url": "js/app.fd005031.js"
}, },
{ {
"revision": "9a65f05f9810a3ea7f46", "revision": "9a65f05f9810a3ea7f46",
"url": "js/chunk-vendors.3ef7796f.js" "url": "js/chunk-vendors.3ef7796f.js"
}, },
{ {
"revision": "f125263b13dcf9460fac", "revision": "d60be8c4b24801df7253",
"url": "js/detail.133910b4.js" "url": "js/detail.2147373a.js"
}, },
{ {
"revision": "b46d04eb43bc31ca0f9f95121646440d", "revision": "b46d04eb43bc31ca0f9f95121646440d",

2
app/src/main/assets/web/bookshelf/service-worker.js
Unescape View File

@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts( importScripts(
"precache-manifest.04173d48a716bddd6fb159c907ea23ec.js" "precache-manifest.1be475b0fa464f5fe47e53b13d56bc1a.js"
); );
workbox.core.setCacheNameDetails({prefix: "yd-web-tool"}); workbox.core.setCacheNameDetails({prefix: "yd-web-tool"});

4
app/src/main/java/io/legado/app/help/AppConfig.kt
Unescape View File

@ -231,8 +231,8 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
private fun getPrefUserAgent(): String { private fun getPrefUserAgent(): String {
val ua = appCtx.getPrefString(PreferKey.userAgent) val ua = appCtx.getPrefString(PreferKey.userAgent)
if (ua.isNullOrBlank()) { if (ua.isNullOrBlank()) {
return "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36" return "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
} }
return ua return ua
} }
} }

7
app/src/main/java/io/legado/app/help/http/cronet/CronetHelper.kt
Unescape View File

@ -41,7 +41,11 @@ fun buildRequest(request: Request, callback: UrlRequest.Callback): UrlRequest {
} }
val headers: Headers = request.headers val headers: Headers = request.headers
headers.forEachIndexed { index, _ -> headers.forEachIndexed { index, _ ->
requestBuilder.addHeader(headers.name(index), headers.value(index)) val name = headers.name(index)
if (!name.equals("Keep-Alive", true)) {
requestBuilder.addHeader(name, headers.value(index))
}
} }
val requestBody = request.body val requestBody = request.body
@ -60,6 +64,5 @@ fun buildRequest(request: Request, callback: UrlRequest.Callback): UrlRequest {
} }
return requestBuilder.build() return requestBuilder.build()
} }

7
app/src/main/res/xml/network_security_config.xml
Unescape View File

@ -3,4 +3,11 @@
<base-config <base-config
cleartextTrafficPermitted="true" cleartextTrafficPermitted="true"
tools:ignore="InsecureBaseConfiguration" /> tools:ignore="InsecureBaseConfiguration" />
<debug-overrides cleartextTrafficPermitted="true">
<trust-anchors>
<certificates src="user" />
<certificates src="system"/>
</trust-anchors>
</debug-overrides>
</network-security-config> </network-security-config>
Write Preview
Loading…
Cancel
Save