From a51f349c8682ba26ea28a63b845d80a8c2aeeebf Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 29 Mar 2020 19:25:00 -0700
Subject: Encode url query

---
 .../kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index 58e7d629..b3dc58c6 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -39,6 +39,7 @@ import android.widget.TextView
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.widget.Toolbar
 import androidx.core.graphics.alpha
+import androidx.core.text.htmlEncode
 import androidx.core.view.updateLayoutParams
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
@@ -123,6 +124,7 @@ import com.pitchedapps.frost.utils.launchLogin
 import com.pitchedapps.frost.utils.launchNewTask
 import com.pitchedapps.frost.utils.launchWebOverlay
 import com.pitchedapps.frost.utils.setFrostColors
+import com.pitchedapps.frost.utils.urlEncode
 import com.pitchedapps.frost.views.BadgedIcon
 import com.pitchedapps.frost.views.FrostVideoViewer
 import com.pitchedapps.frost.views.FrostViewPager
@@ -131,6 +133,8 @@ import kotlin.math.abs
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
 
 /**
  * Created by Allan Wang on 20/12/17.
@@ -649,12 +653,13 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
                             if (items.isNotEmpty())
                                 items.add(
                                     SearchItem(
-                                        "${FbItem._SEARCH.url}?q=$query",
+                                        "${FbItem._SEARCH.url}/?q=${query.urlEncode()}",
                                         string(R.string.show_all_results),
                                         iicon = null
                                     )
                                 )
                             searchViewCache[query] = items
+
                             searchView.results = items
                         }
                     }
@@ -663,7 +668,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
                 searchCallback =
                     { query, _ ->
                         launchWebOverlay(
-                            "${FbItem._SEARCH.url}/?q=$query",
+                            "${FbItem._SEARCH.url}/?q=${query.urlEncode()}",
                             fbCookie,
                             prefs
                         ); true
-- 
cgit v1.2.3