From fdaf72f5e9ed8a6ee2030862b2e0c58d106d25bb Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 15 Sep 2019 00:42:57 -0700 Subject: Remove more unused methods --- .../frost/facebook/requests/FbRequest.kt | 48 ---------------------- 1 file changed, 48 deletions(-) diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt index 53126938..7900534c 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt @@ -17,22 +17,11 @@ package com.pitchedapps.frost.facebook.requests import com.pitchedapps.frost.BuildConfig -import com.pitchedapps.frost.facebook.FB_JSON_URL_MATCHER import com.pitchedapps.frost.facebook.USER_AGENT -import com.pitchedapps.frost.facebook.get import okhttp3.Call -import okhttp3.FormBody import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.logging.HttpLoggingInterceptor -import org.apache.commons.text.StringEscapeUtils - -/** - * Request container with the execution call - */ -class FrostRequest(val call: Call, private val invoke: (Call) -> T) { - fun invoke() = invoke(call) -} val httpClient: OkHttpClient by lazy { val builder = OkHttpClient.Builder() @@ -44,21 +33,6 @@ val httpClient: OkHttpClient by lazy { builder.build() } -internal fun List>.toForm(): FormBody { - val builder = FormBody.Builder() - forEach { (key, value) -> - val v = value?.toString() ?: "" - builder.add(key, v) - } - return builder.build() -} - -internal fun List>.withEmptyData(vararg key: String): List> { - val newList = toMutableList() - newList.addAll(key.map { it to null }) - return newList -} - internal fun String?.requestBuilder(): Request.Builder { val builder = Request.Builder() .header("User-Agent", USER_AGENT) @@ -69,25 +43,3 @@ internal fun String?.requestBuilder(): Request.Builder { } fun Request.Builder.call(): Call = httpClient.newCall(build()) - -/** - * Execute the call and attempt to check validity - * Valid = not blank & no "error" instance - */ -fun executeForNoError(call: Call): Boolean { - val body = call.execute().body() ?: return false - var empty = true - body.charStream().useLines { lines -> - lines.forEach { - if (it.contains("error")) return false - if (empty && it.isNotEmpty()) empty = false - } - } - return !empty -} - -fun getJsonUrl(call: Call): String? { - val body = call.execute().body() ?: return null - val url = FB_JSON_URL_MATCHER.find(body.string())[1] ?: return null - return StringEscapeUtils.unescapeEcmaScript(url) -} -- cgit v1.2.3