From 10b31bd09aa73687f7ac2466ae2cb0d03c33c855 Mon Sep 17 00:00:00 2001 From: weishu Date: Sat, 21 Oct 2023 15:29:26 +0800 Subject: [PATCH] manager: Fix remote template fetch error. --- .../kernelsu/ui/viewmodel/TemplateViewModel.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/TemplateViewModel.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/TemplateViewModel.kt index bb99283e..fa76089a 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/TemplateViewModel.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/TemplateViewModel.kt @@ -88,10 +88,10 @@ class TemplateViewModel : ViewModel() { } private fun fetchRemoteTemplates() { - OkHttpClient().newCall( - Request.Builder().url(TEMPLATE_INDEX_URL).build() - ).runCatching { - execute().use { response -> + runCatching { + OkHttpClient().newCall( + Request.Builder().url(TEMPLATE_INDEX_URL).build() + ).execute().use { response -> if (!response.isSuccessful) { return } @@ -125,9 +125,7 @@ private fun fetchRemoteTemplates() { } } } - }.onFailure { - Log.e(TAG, "fetchRemoteTemplates error", it) - } + }.onFailure { Log.e(TAG, "fetchRemoteTemplates: $it", it) } } @Suppress("UNCHECKED_CAST") @@ -168,7 +166,7 @@ private fun fromJSON(templateJson: JSONObject): TemplateViewModel.TemplateInfo? id = templateJson.getString("id"), name = templateJson.getString("name"), description = templateJson.getString("description"), - local = templateJson.getBoolean("local"), + local = templateJson.optBoolean("local"), namespace = Natives.Profile.Namespace.valueOf( templateJson.getString("namespace").uppercase() ).ordinal,