From fe1df730a180316f76c334879da88515a0150a42 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Wed, 11 Oct 2017 01:51:21 -0400 Subject: Search Parsing (#379) * Update parser interface and add search parsing * Add custom jsoup method and search parse method * Bind new searchview * Add search view cache --- .../main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt | 4 ---- app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt | 11 ++--------- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/settings') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt index acdd835e..db2eea4b 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt @@ -31,10 +31,6 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = { descRes = R.string.viewpager_swipe_desc } - checkbox(R.string.search_bar, { Prefs.searchBar }, { Prefs.searchBar = it; setFrostResult(MainActivity.REQUEST_SEARCH) }) { - descRes = R.string.search_bar_desc - } - checkbox(R.string.force_message_bottom, { Prefs.messageScrollToBottom }, { Prefs.messageScrollToBottom = it }) { descRes = R.string.force_message_bottom_desc } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt index 5784e2a8..a4f4388f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Debug.kt @@ -14,10 +14,7 @@ import com.pitchedapps.frost.facebook.USER_AGENT_BASIC import com.pitchedapps.frost.injectors.InjectorContract import com.pitchedapps.frost.injectors.JsActions import com.pitchedapps.frost.injectors.JsAssets -import com.pitchedapps.frost.utils.L -import com.pitchedapps.frost.utils.cleanHtml -import com.pitchedapps.frost.utils.materialDialogThemed -import com.pitchedapps.frost.utils.sendFrostEmail +import com.pitchedapps.frost.utils.* import com.pitchedapps.frost.web.launchHeadlessHtmlExtractor import com.pitchedapps.frost.web.query import io.reactivex.disposables.Disposable @@ -119,11 +116,7 @@ private enum class Debugger(val data: FbItem, val injector: InjectorContract?, v uiThread { it.setContent("Load Jsoup") it.setOnCancelListener(null) - it.debugAsync { - val connection = Jsoup.connect(data.url).cookie(FACEBOOK_COM, FbCookie.webCookie).userAgent(USER_AGENT_BASIC) - val doc = connection.get() - simplifyJsoup(doc) - } + it.debugAsync { simplifyJsoup(frostJsoup(data.url)) } } } -- cgit v1.2.3