Resolve file uri ourself for ringtones, resolves #1423

1 files changed, 12 insertions, 0 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 00e9a1b9..8ad0d432 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -347,6 +347,18 @@ fun Context.frostUriFromFile(file: File): Uri =
         file
     )
 
+/**
+ * Gets uri from our own resolver if it's a file, or return the parsed uri otherwise
+ */
+fun Context.frostUri(entry: String): Uri {
+    val uri = Uri.parse(entry)
+    val path = uri.path
+    if (uri.scheme == "file" && path != null) {
+        return frostUriFromFile(File(path))
+    }
+    return uri
+}
+
 inline fun Context.sendFrostEmail(@StringRes subjectId: Int, crossinline builder: EmailBuilder.() -> Unit) =
     sendFrostEmail(string(subjectId), builder)