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
+1 -1
View File
@@ -85,7 +85,7 @@ android {
applicationIdSuffix '.release' applicationIdSuffix '.release'
if (getApplicationIdSuffix() == '.releaseA') { if (getApplicationIdSuffix() == '.releaseA') {
manifestPlaceholders.put("app_name", "@string/app_name_a") manifestPlaceholders.put("app_name", "@string/app_name_a")
}else { } else {
manifestPlaceholders.put("app_name", "@string/app_name") manifestPlaceholders.put("app_name", "@string/app_name")
} }
@@ -941,6 +941,7 @@ interface JsExtensions : JsEncodeUtils {
* 输出调试日志 * 输出调试日志
*/ */
fun log(msg: Any?): Any? { fun log(msg: Any?): Any? {
rhinoContext.ensureActive()
getSource()?.let { getSource()?.let {
Debug.log(it.getKey(), msg.toString()) Debug.log(it.getKey(), msg.toString())
} ?: Debug.log(msg.toString()) } ?: Debug.log(msg.toString())
@@ -70,6 +70,7 @@ class HandleFileActivity :
).apply { ).apply {
addAll(getDirActions()) addAll(getDirActions())
} }
else -> arrayListOf() else -> arrayListOf()
} }
intent.getJsonArray<SelectItem<Int>>("otherActions")?.let { intent.getJsonArray<SelectItem<Int>>("otherActions")?.let {
@@ -88,8 +89,7 @@ class HandleFileActivity :
HandleFileContract.DIR -> kotlin.runCatching { HandleFileContract.DIR -> kotlin.runCatching {
selectDocTree.launch() selectDocTree.launch()
}.onFailure { }.onFailure {
AppLog.put(getString(R.string.open_sys_dir_picker_error), it) AppLog.put(getString(R.string.open_sys_dir_picker_error), it, true)
toastOnUi(R.string.open_sys_dir_picker_error)
checkPermissions { checkPermissions {
FilePickerDialog.show( FilePickerDialog.show(
supportFragmentManager, supportFragmentManager,
@@ -97,11 +97,11 @@ class HandleFileActivity :
) )
} }
} }
HandleFileContract.FILE -> kotlin.runCatching { HandleFileContract.FILE -> kotlin.runCatching {
selectDoc.launch(typesOfExtensions(allowExtensions)) selectDoc.launch(typesOfExtensions(allowExtensions))
}.onFailure { }.onFailure {
AppLog.put(getString(R.string.open_sys_dir_picker_error), it) AppLog.put(getString(R.string.open_sys_dir_picker_error), it, true)
toastOnUi(R.string.open_sys_dir_picker_error)
checkPermissions { checkPermissions {
FilePickerDialog.show( FilePickerDialog.show(
supportFragmentManager, supportFragmentManager,
@@ -110,6 +110,7 @@ class HandleFileActivity :
) )
} }
} }
10 -> checkPermissions { 10 -> checkPermissions {
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
lifecycleScope.launchWhenResumed { lifecycleScope.launchWhenResumed {
@@ -119,6 +120,7 @@ class HandleFileActivity :
) )
} }
} }
11 -> checkPermissions { 11 -> checkPermissions {
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
lifecycleScope.launchWhenResumed { lifecycleScope.launchWhenResumed {
@@ -129,6 +131,7 @@ class HandleFileActivity :
) )
} }
} }
111 -> getFileData()?.let { 111 -> getFileData()?.let {
viewModel.upload(it.first, it.second, it.third) { url -> viewModel.upload(it.first, it.second, it.third) { url ->
val uri = Uri.parse(url) val uri = Uri.parse(url)
@@ -136,6 +139,7 @@ class HandleFileActivity :
finish() finish()
} }
} }
else -> { else -> {
val path = item.title val path = item.title
val uri = if (path.isContentScheme()) { val uri = if (path.isContentScheme()) {
+1
View File
@@ -23,6 +23,7 @@
## Rhino ## Rhino
-keep class -keep class
!org.mozilla.javascript.ast.**, !org.mozilla.javascript.ast.**,
!org.mozilla.javascript.xml.**,
!org.mozilla.javascript.commonjs.**, !org.mozilla.javascript.commonjs.**,
!org.mozilla.javascript.optimizer.**, !org.mozilla.javascript.optimizer.**,
!org.mozilla.javascript.serialize.**, !org.mozilla.javascript.serialize.**,