From 56eb8841bd6ce24b8b7967a3a92a7752362e6ac5 Mon Sep 17 00:00:00 2001 From: Diana Victoria Furrer Date: Sun, 15 Jun 2025 02:19:56 +0200 Subject: [PATCH 1/2] use MimeTypeMap from android webkit to check if the json MimeType is unsupported --- .../local/subscription/SubscriptionFragment.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt index 7288d9103..077d69622 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt @@ -13,6 +13,7 @@ import android.view.MenuItem import android.view.SubMenu import android.view.View import android.view.ViewGroup +import android.webkit.MimeTypeMap import android.widget.Toast import androidx.activity.result.ActivityResult import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult @@ -460,6 +461,14 @@ class SubscriptionFragment : BaseStateFragment() { } companion object { - const val JSON_MIME_TYPE = "application/json" + val JSON_MIME_TYPE = getMimeType() + + private fun getMimeType(): String { + val mimeTypeJson = MimeTypeMap.getSingleton().getMimeTypeFromExtension("json") + return if (mimeTypeJson.isNullOrBlank()) + "application/octet-stream" + else + mimeTypeJson + } } } From a00c0b9e2b73405831b043e507318d32d1310f51 Mon Sep 17 00:00:00 2001 From: Diana Victoria Furrer Date: Tue, 17 Jun 2025 15:42:01 +0200 Subject: [PATCH 2/2] change according to Isira-Seneviratne suggestion --- .../local/subscription/SubscriptionFragment.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt index 077d69622..8e758adef 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt @@ -461,14 +461,7 @@ class SubscriptionFragment : BaseStateFragment() { } companion object { - val JSON_MIME_TYPE = getMimeType() - - private fun getMimeType(): String { - val mimeTypeJson = MimeTypeMap.getSingleton().getMimeTypeFromExtension("json") - return if (mimeTypeJson.isNullOrBlank()) - "application/octet-stream" - else - mimeTypeJson - } + val JSON_MIME_TYPE = MimeTypeMap.getSingleton() + .getMimeTypeFromExtension("json") ?: "application/octet-stream" } }