Utilize toUri KTX extension

app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt

@@ -18,11 +18,11 @@ import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import androidx.annotation.RequiresApi
+import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.ThemeStore
@@ -54,7 +54,7 @@ class PermissionActivity : AbsMusicServiceActivity() {
             binding.audioPermission.setButtonClick {
                 if (RingtoneManager.requiresDialog(this@PermissionActivity)) {
                     val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS)
-                    intent.data = Uri.parse("package:" + applicationContext.packageName)
+                    intent.data = ("package:" + applicationContext.packageName).toUri()
                     startActivity(intent)
                 }
             }

app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt

@@ -18,10 +18,10 @@ import android.content.res.ColorStateList
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
-import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore.Images.Media
 import android.view.MenuItem
+import androidx.core.net.toUri
 import androidx.core.view.drawToBitmap
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
@@ -87,10 +87,9 @@ class ShareInstagramStory : AbsBaseActivity() {
                     binding.mainContent.drawToBitmap(Bitmap.Config.ARGB_8888),
                     "Design", null
                 )
-                val uri = Uri.parse(path)
                 Share.shareStoryToSocial(
                     this@ShareInstagramStory,
-                    uri
+                    path.toUri()
                 )
             }
         }

app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt

@@ -17,7 +17,6 @@ package code.name.monkey.retromusic.activities.bugreport
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.MenuItem
@@ -26,6 +25,7 @@ import android.widget.Toast
 import androidx.annotation.StringDef
 import androidx.annotation.StringRes
 import androidx.core.content.getSystemService
+import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.MaterialUtil
@@ -154,7 +154,7 @@ open class BugReportActivity : AbsThemeActivity() {
             copyDeviceInfoToClipBoard()
 
             val i = Intent(Intent.ACTION_VIEW)
-            i.data = Uri.parse(ISSUE_TRACKER_LINK)
+            i.data = ISSUE_TRACKER_LINK.toUri()
             i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             startActivity(i)
         }

app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt

@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.extensions
 
-import android.net.Uri
 import android.webkit.MimeTypeMap
+import androidx.core.net.toUri
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.RetroUtil
 import org.jaudiotagger.audio.AudioFileIO
@@ -14,7 +14,7 @@ fun getSongInfo(song: Song): String {
         return try {
             val audioHeader = AudioFileIO.read(File(song.data)).audioHeader
             val string: StringBuilder = StringBuilder()
-            val uriFile = Uri.fromFile(file)
+            val uriFile = file.toUri()
             string.append(getMimeType(uriFile.toString())).append(" • ")
             string.append(audioHeader.bitRate).append(" kb/s").append(" • ")
             string.append(RetroUtil.frequencyCount(audioHeader.sampleRate.toInt()))

app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt

@@ -16,10 +16,10 @@ package code.name.monkey.retromusic.fragments.about
 
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import androidx.core.app.ShareCompat
+import androidx.core.net.toUri
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DefaultItemAnimator
@@ -55,7 +55,7 @@ class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
 
     private fun openUrl(url: String) {
         val i = Intent(Intent.ACTION_VIEW)
-        i.data = Uri.parse(url)
+        i.data = url.toUri()
         i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(i)
     }

app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt

@@ -7,10 +7,10 @@ import android.media.AudioAttributes
 import android.media.AudioManager
 import android.media.MediaPlayer
 import android.media.audiofx.AudioEffect
-import android.net.Uri
 import android.os.PowerManager
 import android.util.Log
 import android.widget.Toast
+import androidx.core.net.toUri
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.service.AudioFader.Companion.createFadeAnimator
@@ -160,7 +160,7 @@ class CrossFadePlayer(val context: Context) : Playback, MediaPlayer.OnCompletion
         player.setOnPreparedListener(null)
         try {
             if (path.startsWith("content://")) {
-                player.setDataSource(context, Uri.parse(path))
+                player.setDataSource(context, path.toUri())
             } else {
                 player.setDataSource(path)
             }

app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt

@@ -13,6 +13,7 @@ import android.text.TextUtils
 import android.util.Log
 import android.widget.Toast
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
@@ -99,7 +100,7 @@ object MusicUtil : KoinComponent {
 
     fun deleteAlbumArt(context: Context, albumId: Long) {
         val contentResolver = context.contentResolver
-        val localUri = Uri.parse("content://media/external/audio/albumart")
+        val localUri = "content://media/external/audio/albumart".toUri()
         contentResolver.delete(ContentUris.withAppendedId(localUri, albumId), null, null)
         contentResolver.notifyChange(localUri, null)
     }
@@ -189,7 +190,7 @@ object MusicUtil : KoinComponent {
 
     @JvmStatic
     fun getMediaStoreAlbumCoverUri(albumId: Long): Uri {
-        val sArtworkUri = Uri.parse("content://media/external/audio/albumart")
+        val sArtworkUri = "content://media/external/audio/albumart".toUri()
         return ContentUris.withAppendedId(sArtworkUri, albumId)
     }
 
@@ -309,7 +310,7 @@ object MusicUtil : KoinComponent {
         path: String?
     ) {
         val contentResolver = context.contentResolver
-        val artworkUri = Uri.parse("content://media/external/audio/albumart")
+        val artworkUri = "content://media/external/audio/albumart".toUri()
         contentResolver.delete(ContentUris.withAppendedId(artworkUri, albumId), null, null)
         val values = ContentValues()
         values.put("album_id", albumId)
@@ -454,7 +455,7 @@ object MusicUtil : KoinComponent {
             } catch (ignored: SecurityException) {
 
             }
-            activity.contentResolver.notifyChange(Uri.parse("content://media"), null)
+            activity.contentResolver.notifyChange("content://media".toUri(), null)
             activity.runOnUiThread {
                 Toast.makeText(
                     activity,

app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt

@@ -16,11 +16,11 @@ package code.name.monkey.retromusic.util
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.provider.BaseColumns
 import android.provider.MediaStore
 import android.provider.Settings
 import android.widget.Toast
+import androidx.core.net.toUri
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Song
@@ -69,7 +69,7 @@ class RingtoneManager(val context: Context) {
                 .setMessage(R.string.dialog_message_set_ringtone)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS)
-                    intent.data = Uri.parse("package:" + context.applicationContext.packageName)
+                    intent.data = ("package:" + context.applicationContext.packageName).toUri()
                     context.startActivity(intent)
                 }
                 .setNegativeButton(android.R.string.cancel, null)