fix: opened files having unusable file names

abdallahmehiz · Aug 17, 2024 · 8c97613 · 8c97613
1 parent 1307702
commit 8c97613
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerActivity.kt b/app/src/main/java/live/mehiz/mpvkt/ui/player/PlayerActivity.kt
@@ -351,16 +351,12 @@ class PlayerActivity : AppCompatActivity() {
   }
 
   private fun getFileName(intent: Intent): String? {
-    if (intent.hasExtra(Intent.EXTRA_STREAM)) {
-      val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)!!
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        val cursor = contentResolver.query(uri, arrayOf(MediaStore.MediaColumns.DISPLAY_NAME), null, null)
-        if (cursor!!.moveToFirst()) return cursor.getString(0).also { cursor.close() }
-      }
+    val uri = (intent.data ?: intent.getParcelableExtra(Intent.EXTRA_STREAM))
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && uri != null) {
+      val cursor = contentResolver.query(uri, arrayOf(MediaStore.MediaColumns.DISPLAY_NAME), null, null)
+      if (cursor?.moveToFirst() == true) return cursor.getString(0).also { cursor.close() }
     }
-    return (intent.data ?: intent.getParcelableExtra(Intent.EXTRA_STREAM))
-      ?.lastPathSegment
-      ?.substringAfterLast('/')
+    return uri?.lastPathSegment?.substringAfterLast("/")
   }
 
   private fun resolveUri(data: Uri): String? {