Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-04 07:25:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add null check in UriUtil.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-04-09 22:22:21 -04:00
committed by jeffrey-signal
parent 5db8463c70
commit 98d9b12438
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/util/UriUtil.kt
View File

@@ -9,7 +9,6 @@ import android.content.ContentResolver
import android.content.Context
import android.net.Uri
import java.io.File
import java.io.IOException
object UriUtil {
@@ -22,12 +21,13 @@ object UriUtil {
fun isValidExternalUri(context: Context, uri: Uri): Boolean {
if (ContentResolver.SCHEME_FILE == uri.scheme) {
try {
val file = File(uri.path)
val path = uri.path ?: return false
val file = File(path)
return file.canonicalPath == file.path &&
!file.canonicalPath.startsWith("/data") &&
!file.canonicalPath.contains(context.packageName)
} catch (e: IOException) {
} catch (e: Exception) {
return false
}
} else if (ContentResolver.SCHEME_CONTENT == uri.scheme) {