Merge pull request #12356 from dev-victoria/fix-json-importing-oldandroid

Isira-Seneviratne · web-flow · commit 2dd11f70a3a3 · 2025-07-04T07:06:34.000+05:30
check if the JSON MimeType is supported
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
@@ -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,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     }
 
     companion object {
-        const val JSON_MIME_TYPE = "application/json"
+        val JSON_MIME_TYPE = MimeTypeMap.getSingleton()
+            .getMimeTypeFromExtension("json") ?: "application/octet-stream"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import android.view.MenuItem`
`13`	`13`	`import android.view.SubMenu`
`14`	`14`	`import android.view.View`
`15`	`15`	`import android.view.ViewGroup`
	`16`	`+import android.webkit.MimeTypeMap`
`16`	`17`	`import android.widget.Toast`
`17`	`18`	`import androidx.activity.result.ActivityResult`
`18`	`19`	`import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult`
`@@ -460,6 +461,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {`
`460`	`461`	`}`
`461`	`462`
`462`	`463`	`companion object {`
`463`		`- const val JSON_MIME_TYPE = "application/json"`
	`464`	`+ val JSON_MIME_TYPE = MimeTypeMap.getSingleton()`
	`465`	`+ .getMimeTypeFromExtension("json") ?: "application/octet-stream"`
`464`	`466`	`}`
`465`	`467`	`}`