From 6871d134e170614409c3971d2f900c6a1c79eccf Mon Sep 17 00:00:00 2001 From: tateisu Date: Thu, 21 Mar 2024 03:01:56 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A8=80=E8=AA=9E=E3=83=95=E3=82=A3=E3=83=AB?= =?UTF-8?q?=E3=82=BF=E7=94=BB=E9=9D=A2=E3=81=A7=E6=88=BB=E3=82=8B=E3=83=9C?= =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC=E3=81=97=E3=81=9F=E9=9A=9B?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/languageFilter/LanguageFilterViewModel.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ui/languageFilter/LanguageFilterViewModel.kt b/app/src/main/java/jp/juggler/subwaytooter/ui/languageFilter/LanguageFilterViewModel.kt index 5fdd9d43..a92826a2 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ui/languageFilter/LanguageFilterViewModel.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ui/languageFilter/LanguageFilterViewModel.kt @@ -203,12 +203,12 @@ class LanguageFilterViewModel( } fun isLanguageListChanged(): Boolean { - fun JsonObject.encodeSorted(): String { - val clone = this.toString().decodeJsonObject() - if (!clone.contains(TootStatus.LANGUAGE_CODE_DEFAULT)) { - clone[TootStatus.LANGUAGE_CODE_DEFAULT] = true + fun JsonObject.encodeSorted() = toString().decodeJsonObject().run { + if (!contains(TootStatus.LANGUAGE_CODE_DEFAULT)) { + put(TootStatus.LANGUAGE_CODE_DEFAULT, true) } - return clone.keys.sorted().joinToString(",") { "$it=${this[it]}" } + entries.sortedBy { it.key } + .joinToString(",") { "${it.key}=${it.value}" } } val current = (encodeLanguageList()).encodeSorted()