From 32e77346ff98ae1133e76ab6dfd880b26171005e Mon Sep 17 00:00:00 2001
From: kyori19 <kyori.dis@gmail.com>
Date: Sun, 1 Dec 2019 00:07:33 +0900
Subject: [PATCH] Move encoding part too

---
 .../main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt | 3 ++-
 app/src/main/java/com/keylesspalace/tusky/db/Converters.kt     | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
index fe8783acd..feee8a8ee 100644
--- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
@@ -41,6 +41,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.activity_tab_preference.*
 import kotlinx.android.synthetic.main.toolbar_basic.*
+import java.net.URLEncoder
 import java.util.regex.Pattern
 import javax.inject.Inject
 
@@ -229,7 +230,7 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
                 .setTitle(R.string.select_list_title)
                 .setAdapter(adapter) { _, position ->
                     val list = adapter.getItem(position)
-                    val newTab = createTabDataFromId(LIST, listOf(list!!.id, list.title))
+                    val newTab = createTabDataFromId(LIST, listOf(list!!.id,  URLEncoder.encode(list.title, "UTF-8")))
                     currentTabs.add(newTab)
                     currentTabsAdapter.notifyItemInserted(currentTabs.size - 1)
                     updateAvailableTabs()
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt b/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
index 24b1a6bbc..801dd0c93 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
@@ -28,7 +28,6 @@ import com.keylesspalace.tusky.entity.Poll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.json.SpannedTypeAdapter
 import com.keylesspalace.tusky.util.HtmlUtils
-import java.net.URLEncoder
 import java.util.*
 
 class Converters {
@@ -69,7 +68,7 @@ class Converters {
     @TypeConverter
     fun tabDataToString(tabData: List<TabData>?): String? {
         // List name may include ":"
-        return tabData?.joinToString(";") { it.id + ":" + it.arguments.joinToString(":") { s -> URLEncoder.encode(s, "UTF-8") } }
+        return tabData?.joinToString(";") { it.id + ":" + it.arguments.joinToString(":") }
     }
 
     @TypeConverter