Skip to content

Fix document picker null name crash #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcprux merged 3 commits into from
Jun 11, 2026
Merged

Fix document picker null name crash #34

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
714b96a
Fix Android DocumentPicker crash on null DISPLAY_NAME / bad URL compo…
Davedeji Jun 10, 2026
23d1f75
Use File.toURI() so cached-file paths with spaces don't crash URL init
Davedeji Jun 10, 2026
39f1972
Tighten comments in DocumentPicker patch
Davedeji Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 37 additions & 24 deletions Sources/SkipKit/DocumentPicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,38 +42,51 @@ extension View {
logger.log(message: "selected document uri: \(uri)")
if let uri = uri {
let resolver = context.contentResolver

var resolvedName: String? = nil
var resolvedMime: String? = nil

if let query = resolver.query(uri, nil, nil, nil, nil) {
let nameIndex = query.getColumnIndexOrThrow(android.provider.OpenableColumns.DISPLAY_NAME)
let mimetypeIndex = query.getColumnIndexOrThrow(android.provider.DocumentsContract.Document.COLUMN_MIME_TYPE)
query.moveToFirst()
let name = query.getString(nameIndex)
let type = query.getString(mimetypeIndex)

selectedFilename.wrappedValue = name
selectedFileMimeType.wrappedValue = type

// To be able to access the file from another part of the app it needs to be copied in tha cached directory:
if let storageDir = context.cacheDir, let url = URL(string: storageDir.path) {
let filemanager = FileManager.default
let destinationFileURL = url.appendingPathComponent(selectedFilename.wrappedValue!)

if filemanager.fileExists(atPath: destinationFileURL.path) {
try? filemanager.removeItem(at: destinationFileURL)
if query.moveToFirst() {
// Downloads provider omits these columns; tolerate -1.
let nameIndex = query.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME)
if nameIndex >= 0 {
resolvedName = query.getString(nameIndex)
}
let mimeIndex = query.getColumnIndex(android.provider.DocumentsContract.Document.COLUMN_MIME_TYPE)
if mimeIndex >= 0 {
resolvedMime = query.getString(mimeIndex)
}

let inputStream = resolver.openInputStream(uri)!
let outputFile = java.io.File(destinationFileURL.path)
let outputStream = java.io.FileOutputStream(outputFile)
}
query.close()
}

if resolvedMime == nil {
resolvedMime = resolver.getType(uri)
}

let safeName: String = resolvedName ?? "import-\(java.util.UUID.randomUUID().toString())"

selectedFilename.wrappedValue = safeName
selectedFileMimeType.wrappedValue = resolvedMime

// java.io.File path avoids Skip URL.appendingPathComponent NPE.
if let cacheDir = context.cacheDir {
let destinationFile = java.io.File(cacheDir, safeName)
if destinationFile.exists() {
destinationFile.delete()
}
if let inputStream = resolver.openInputStream(uri) {
let outputStream = java.io.FileOutputStream(destinationFile)
inputStream.copyTo(outputStream)

outputStream.close()
inputStream.close()

selectedDocumentURL.wrappedValue = destinationFileURL
// File.toURI() percent-encodes; raw path would crash java.net.URI.
selectedDocumentURL.wrappedValue = URL(platformValue: destinationFile.toURI())
} else {
selectedDocumentURL.wrappedValue = URL(platformValue: java.net.URI.create(uri.toString()))
}
} else {
selectedDocumentURL.wrappedValue = URL(platformValue: java.net.URI.create(uri.toString()))
}
}
}
Expand Down
Loading