YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-02-02 21:34:20 +08:00
parent ebdef8f73f
commit 45b6f77ebe
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/service/CheckSourceService.kt
+1 -1
View File
@@ -146,7 +146,7 @@ class CheckSourceService : BaseService() {
if (source.hasGroup("搜索失效") && url.isNullOrBlank()) { if (source.hasGroup("搜索失效") && url.isNullOrBlank()) {
throw NoStackTraceException("搜索内容为空并且没有发现") throw NoStackTraceException("搜索内容为空并且没有发现")
} }
books = WebBook.exploreBookAwait(this, source, url) books = WebBook.exploreBookAwait(this, source, url!!)
if (books.isEmpty()) { if (books.isEmpty()) {
throw NoStackTraceException("发现书籍为空") throw NoStackTraceException("发现书籍为空")
} }
app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt
+7 -1
View File
@@ -137,7 +137,13 @@ class FileAssociationActivity :
} }
} }
}.onFailure { }.onFailure {
toastOnUi(it.localizedMessage) when (it) {
is SecurityException -> localBookTreeSelect.launch {
title = "选择保存书籍的文件夹"
mode = HandleFileContract.DIR_SYS
}
else -> toastOnUi(it.localizedMessage)
}
} }
} }
} }
app/src/main/java/io/legado/app/utils/ToastUtils.kt
+32 -24
View File
@@ -10,49 +10,57 @@ private var toast: Toast? = null
fun Context.toastOnUi(message: Int) { fun Context.toastOnUi(message: Int) {
runOnUI { runOnUI {
if (toast == null) { kotlin.runCatching {
toast = Toast.makeText(this, message, Toast.LENGTH_SHORT) if (toast == null) {
} else { toast = Toast.makeText(this, message, Toast.LENGTH_SHORT)
toast?.setText(message) } else {
toast?.duration = Toast.LENGTH_SHORT toast?.setText(message)
toast?.duration = Toast.LENGTH_SHORT
}
toast?.show()
} }
toast?.show()
} }
} }
fun Context.toastOnUi(message: CharSequence?) { fun Context.toastOnUi(message: CharSequence?) {
runOnUI { runOnUI {
if (toast == null) { kotlin.runCatching {
toast = Toast.makeText(this, message, Toast.LENGTH_SHORT) if (toast == null) {
} else { toast = Toast.makeText(this, message, Toast.LENGTH_SHORT)
toast?.setText(message) } else {
toast?.duration = Toast.LENGTH_SHORT toast?.setText(message)
toast?.duration = Toast.LENGTH_SHORT
}
toast?.show()
} }
toast?.show()
} }
} }
fun Context.longToastOnUi(message: Int) { fun Context.longToastOnUi(message: Int) {
runOnUI { runOnUI {
if (toast == null) { kotlin.runCatching {
toast = Toast.makeText(this, message, Toast.LENGTH_LONG) if (toast == null) {
} else { toast = Toast.makeText(this, message, Toast.LENGTH_LONG)
toast?.setText(message) } else {
toast?.duration = Toast.LENGTH_LONG toast?.setText(message)
toast?.duration = Toast.LENGTH_LONG
}
toast?.show()
} }
toast?.show()
} }
} }
fun Context.longToastOnUi(message: CharSequence?) { fun Context.longToastOnUi(message: CharSequence?) {
runOnUI { runOnUI {
if (toast == null) { kotlin.runCatching {
toast = Toast.makeText(this, message, Toast.LENGTH_LONG) if (toast == null) {
} else { toast = Toast.makeText(this, message, Toast.LENGTH_LONG)
toast?.setText(message) } else {
toast?.duration = Toast.LENGTH_LONG toast?.setText(message)
toast?.duration = Toast.LENGTH_LONG
}
toast?.show()
} }
toast?.show()
} }
} }