From 8947ee26d780bb69c3334dfb4f9520c6af4acfd4 Mon Sep 17 00:00:00 2001 From: David Allison <62114487+david-allison@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:19:50 +0100 Subject: [PATCH] refactor: remove dead code Remaining code used in AddonData --- .../java/com/ichi2/anki/web/HttpFetcher.kt | 48 ++----------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt b/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt index 21fac2f259..405919a4df 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.kt @@ -19,29 +19,23 @@ ****************************************************************************************/ package com.ichi2.anki.web -import android.content.Context -import com.ichi2.compat.CompatHelper import com.ichi2.utils.KotlinCleanup import com.ichi2.utils.VersionUtils.pkgVersionName import okhttp3.Interceptor import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.RequestBody.Companion.toRequestBody -import okhttp3.Response import timber.log.Timber import java.io.BufferedReader -import java.io.File import java.io.InputStreamReader -import java.net.URL import java.nio.charset.Charset import java.util.concurrent.TimeUnit const val CONN_TIMEOUT = 30000 /** - * Helper class to download from web. - *

- * Used in AsyncTasks in Translation and Pronunciation activities, and more... + * Helper class for downloads + * + * Used for Addon downloads */ object HttpFetcher { /** @@ -116,40 +110,4 @@ object HttpFetcher { "FAILED with exception: " + e.message } } - - fun downloadFileToSdCard(UrlToFile: String, context: Context, prefix: String?): String { - var str = downloadFileToSdCardMethod(UrlToFile, context, prefix, "GET") - if (str.startsWith("FAIL")) { - str = downloadFileToSdCardMethod(UrlToFile, context, prefix, "POST") - } - return str - } - - private fun downloadFileToSdCardMethod(UrlToFile: String, context: Context, prefix: String?, method: String): String { - var response: Response? = null - return try { - val url = URL(UrlToFile) - val extension = UrlToFile.substring(UrlToFile.length - 4) - val requestBuilder = Request.Builder() - requestBuilder.url(url) - if ("GET" == method) { - requestBuilder.get() - } else { - requestBuilder.post(ByteArray(0).toRequestBody(null, 0, 0)) - } - val request: Request = requestBuilder.build() - val client: OkHttpClient = getOkHttpBuilder(true).build() - response = client.newCall(request).execute() - val file = File.createTempFile(prefix!!, extension, context.cacheDir) - response.body!!.byteStream().use { inputStream -> - CompatHelper.compat.copyFile(inputStream, file.canonicalPath) - } - file.absolutePath - } catch (e: Exception) { - Timber.w(e) - "FAILED " + e.message - } finally { - response?.body?.close() - } - } }