TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-27 14:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make fetchUpdate safe

Browse Source
This commit is contained in:
Wang Han
2025-09-30 22:18:27 +08:00
committed by John Wu
parent c07fdc87e3
commit ca2e40593f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
View File

@@ -73,7 +73,8 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
val noteText = when { val noteText = when {
noteFile.exists() -> noteFile.readText() noteFile.exists() -> noteFile.readText()
else -> { else -> {
val note = svc.fetchUpdate(APP_VERSION_CODE).note val note = svc.fetchUpdate(APP_VERSION_CODE)?.note.orEmpty()
if (note.isEmpty()) return@launch
noteFile.writeText(note) noteFile.writeText(note)
note note
} }

4
app/core/src/main/java/com/topjohnwu/magisk/core/repository/NetworkService.kt
View File

@@ -41,7 +41,9 @@ class NetworkService(
info info
} }
suspend fun fetchUpdate(version: Int) = findRelease { it.versionCode == version }.asInfo() suspend fun fetchUpdate(version: Int) = safe {
findRelease { it.versionCode == version }.asInfo()
}
// Keep going through all release pages until we find a match // Keep going through all release pages until we find a match
private suspend inline fun findRelease(predicate: (Release) -> Boolean): Release? { private suspend inline fun findRelease(predicate: (Release) -> Boolean): Release? {