renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

优化
Some checks failed
Test Build / prepare (push) Has been cancelled
Details
Test Build / build (app, release) (push) Has been cancelled
Details
Test Build / build (app, releaseA) (push) Has been cancelled
Details
Test Build / prerelease (push) Has been cancelled
Details
Test Build / lanzou (push) Has been cancelled
Details
Test Build / test_Branch (push) Has been cancelled
Details
Test Build / telegram (push) Has been cancelled
Details
update fork / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Horis
2025-04-11 15:04:43 +08:00
parent a9d6b91010
commit 1b33dd9dc2
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -85,7 +85,7 @@ android {
applicationIdSuffix '.release'
if (getApplicationIdSuffix() == '.releaseA') {
manifestPlaceholders.put("app_name", "@string/app_name_a")
}else {
} else {
manifestPlaceholders.put("app_name", "@string/app_name")
}

1
app/src/main/java/io/legado/app/help/JsExtensions.kt
View File

@@ -941,6 +941,7 @@ interface JsExtensions : JsEncodeUtils {
* 输出调试日志
*/
fun log(msg: Any?): Any? {
rhinoContext.ensureActive()
getSource()?.let {
Debug.log(it.getKey(), msg.toString())
} ?: Debug.log(msg.toString())

12
app/src/main/java/io/legado/app/ui/file/HandleFileActivity.kt
View File

@@ -70,6 +70,7 @@ class HandleFileActivity :
).apply {
addAll(getDirActions())
}
else -> arrayListOf()
}
intent.getJsonArray<SelectItem<Int>>("otherActions")?.let {
@@ -88,8 +89,7 @@ class HandleFileActivity :
HandleFileContract.DIR -> kotlin.runCatching {
selectDocTree.launch()
}.onFailure {
AppLog.put(getString(R.string.open_sys_dir_picker_error), it)
toastOnUi(R.string.open_sys_dir_picker_error)
AppLog.put(getString(R.string.open_sys_dir_picker_error), it, true)
checkPermissions {
FilePickerDialog.show(
supportFragmentManager,
@@ -97,11 +97,11 @@ class HandleFileActivity :
)
}
}
HandleFileContract.FILE -> kotlin.runCatching {
selectDoc.launch(typesOfExtensions(allowExtensions))
}.onFailure {
AppLog.put(getString(R.string.open_sys_dir_picker_error), it)
toastOnUi(R.string.open_sys_dir_picker_error)
AppLog.put(getString(R.string.open_sys_dir_picker_error), it, true)
checkPermissions {
FilePickerDialog.show(
supportFragmentManager,
@@ -110,6 +110,7 @@ class HandleFileActivity :
)
}
}
10 -> checkPermissions {
@Suppress("DEPRECATION")
lifecycleScope.launchWhenResumed {
@@ -119,6 +120,7 @@ class HandleFileActivity :
)
}
}
11 -> checkPermissions {
@Suppress("DEPRECATION")
lifecycleScope.launchWhenResumed {
@@ -129,6 +131,7 @@ class HandleFileActivity :
)
}
}
111 -> getFileData()?.let {
viewModel.upload(it.first, it.second, it.third) { url ->
val uri = Uri.parse(url)
@@ -136,6 +139,7 @@ class HandleFileActivity :
finish()
}
}
else -> {
val path = item.title
val uri = if (path.isContentScheme()) {

1
modules/rhino/consumer-rules.pro
View File

@@ -23,6 +23,7 @@
## Rhino
-keep class
!org.mozilla.javascript.ast.**,
!org.mozilla.javascript.xml.**,
!org.mozilla.javascript.commonjs.**,
!org.mozilla.javascript.optimizer.**,
!org.mozilla.javascript.serialize.**,