Extracted deprecated methods to functions e.g. Environment.getExternalStorageDirectory()
This commit is contained in:
parent
aaee076718
commit
3105da068d
24 changed files with 94 additions and 67 deletions
|
@ -11,6 +11,7 @@ import code.name.monkey.retromusic.helper.BackupContent.*
|
|||
import code.name.monkey.retromusic.model.Song
|
||||
import code.name.monkey.retromusic.repository.Repository
|
||||
import code.name.monkey.retromusic.repository.SongRepository
|
||||
import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import org.koin.core.component.KoinComponent
|
||||
|
@ -249,7 +250,7 @@ object BackupHelper : KoinComponent {
|
|||
|
||||
fun getBackupRoot(): File {
|
||||
return File(
|
||||
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS),
|
||||
getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS),
|
||||
"RetroMusic/Backups"
|
||||
)
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@ import android.app.Activity
|
|||
import android.content.*
|
||||
import android.database.Cursor
|
||||
import android.net.Uri
|
||||
import android.os.Environment
|
||||
import android.os.IBinder
|
||||
import android.provider.DocumentsContract
|
||||
import android.widget.Toast
|
||||
|
@ -30,6 +29,7 @@ import code.name.monkey.retromusic.model.Song
|
|||
import code.name.monkey.retromusic.repository.SongRepository
|
||||
import code.name.monkey.retromusic.service.MusicService
|
||||
import code.name.monkey.retromusic.util.PreferenceUtil
|
||||
import code.name.monkey.retromusic.util.getExternalStorageDirectory
|
||||
import org.koin.core.component.KoinComponent
|
||||
import org.koin.core.component.inject
|
||||
import java.io.File
|
||||
|
@ -440,7 +440,7 @@ object MusicPlayerRemote : KoinComponent {
|
|||
var songFile: File? = null
|
||||
if (uri.authority != null && uri.authority == "com.android.externalstorage.documents") {
|
||||
songFile = File(
|
||||
Environment.getExternalStorageDirectory(),
|
||||
getExternalStorageDirectory(),
|
||||
uri.path?.split(":".toRegex(), 2)?.get(1)
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue