From 94925722ac86dba57dfa4e96d7ded53ed947f445 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 30 Dec 2021 12:11:56 +0530
Subject: [PATCH] [Restore] Fixed wrong file name in RestoreActivity

---
 app/src/debug/res/values/donottranslate.xml            |  2 ++
 .../retromusic/fragments/backup/RestoreActivity.kt     | 10 +++-------
 .../name/monkey/retromusic/helper/MusicPlayerRemote.kt |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/debug/res/values/donottranslate.xml b/app/src/debug/res/values/donottranslate.xml
index 7d3f0ee62..a67ed0a23 100644
--- a/app/src/debug/res/values/donottranslate.xml
+++ b/app/src/debug/res/values/donottranslate.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name" translatable="false">Retro Music-Debug</string>
+
     <bool name="md3_available">true</bool>
     <bool name="allowBackup">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
index feab240ea..5ee4b8ed5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
@@ -67,17 +67,13 @@ class RestoreActivity : AppCompatActivity() {
                 return uri.lastPathSegment
             }
             "content" -> {
-                val proj = arrayOf(MediaStore.Images.Media.TITLE)
+                val proj = arrayOf(MediaStore.Files.FileColumns.DISPLAY_NAME)
                 contentResolver.query(
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
-                        MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL)
-                    } else {
-                        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
-                    }, proj, null, null, null
+                    uri, proj, null, null, null
                 )?.use { cursor ->
                     if (cursor.count != 0) {
                         val columnIndex: Int =
-                            cursor.getColumnIndexOrThrow(MediaStore.Images.Media.TITLE)
+                            cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.DISPLAY_NAME)
                         cursor.moveToFirst()
                         return cursor.getString(columnIndex)
                     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
index 6bd424963..4101f89ef 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
@@ -459,7 +459,7 @@ object MusicPlayerRemote : KoinComponent {
                         songFile = File(path)
                 }
                 if (songFile == null && uri.path != null) {
-                    songFile = File(uri.path)
+                    songFile = File(uri.path!!)
                 }
                 if (songFile != null) {
                     songs = songRepository.songsByFilePath(songFile.absolutePath)