From 00fe44b724ab809c3216a4910e9b50b4447a5488 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Tue, 1 Aug 2023 05:31:10 +0530
Subject: [PATCH] Replace StringJoiner with joinToString()

---
 .../org/koitharu/kotatsu/core/util/ext/Android.kt   | 13 +++++--------
 .../scrobbling/common/data/ScrobblerStorage.kt      |  9 ++-------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt
index 5087a013e..a32bd1a2f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt
@@ -42,7 +42,6 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import okio.IOException
 import org.json.JSONException
-import org.jsoup.internal.StringUtil.StringJoiner
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -173,14 +172,12 @@ fun scaleUpActivityOptionsOf(view: View): Bundle? = if (view.context.isAnimation
 }
 
 fun Resources.getLocalesConfig(): LocaleListCompat {
-	val tagsList = StringJoiner(",")
+	val tagsList = mutableListOf<String>()
 	try {
-		val xpp: XmlPullParser = getXml(R.xml.locales)
+		val xpp = getXml(R.xml.locales)
 		while (xpp.eventType != XmlPullParser.END_DOCUMENT) {
-			if (xpp.eventType == XmlPullParser.START_TAG) {
-				if (xpp.name == "locale") {
-					tagsList.add(xpp.getAttributeValue(0))
-				}
+			if (xpp.eventType == XmlPullParser.START_TAG && xpp.name == "locale") {
+				tagsList.add(xpp.getAttributeValue(0))
 			}
 			xpp.next()
 		}
@@ -189,7 +186,7 @@ fun Resources.getLocalesConfig(): LocaleListCompat {
 	} catch (e: IOException) {
 		e.printStackTraceDebug()
 	}
-	return LocaleListCompat.forLanguageTags(tagsList.complete())
+	return LocaleListCompat.forLanguageTags(tagsList.joinToString(","))
 }
 
 fun Context.findActivity(): Activity? = when (this) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/data/ScrobblerStorage.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/data/ScrobblerStorage.kt
index b5ab50d02..0ce2131f6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/data/ScrobblerStorage.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/data/ScrobblerStorage.kt
@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.scrobbling.common.data
 
 import android.content.Context
 import androidx.core.content.edit
-import org.jsoup.internal.StringUtil.StringJoiner
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerUser
 
@@ -40,12 +39,8 @@ class ScrobblerStorage(context: Context, service: ScrobblerService) {
 				remove(KEY_USER)
 				return@edit
 			}
-			val str = StringJoiner("\n")
-				.add(value.id)
-				.add(value.nickname)
-				.add(value.avatar)
-				.add(value.service.name)
-				.complete()
+			val str = listOf(value.id, value.nickname, value.avatar, value.service.name)
+				.joinToString("\n")
 			putString(KEY_USER, str)
 		}