Skip to content

Preserve original file name on API 33+ by switching to SAF picker #65

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

Closed
IgitBuh wants to merge 1 commit into from
Closed

Preserve original file name on API 33+ by switching to SAF picker #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 39 additions & 19 deletions app/src/main/java/compress/joshattic/us/CompressorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,43 @@ class CompressorViewModel(application: Application) : AndroidViewModel(applicati
private var compressionJob: Job? = null
private var activeTransformer: Transformer? = null

private fun queryDisplayName(context: Context, uri: Uri): String? {
val raw = try {
context.contentResolver.query(
uri,
arrayOf(android.provider.OpenableColumns.DISPLAY_NAME),
null, null, null
)?.use { cursor ->
if (cursor.moveToFirst()) {
val idx = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME)
if (idx >= 0) cursor.getString(idx) else null
} else null
}
} catch (e: Exception) {
e.printStackTrace()
null
}
// Reject Photo Picker synthetic IDs (e.g. "1000040501") — these are MediaStore IDs,
// not real filenames. The picker hides the actual name for privacy on Android 13+.
if (raw.isNullOrBlank() || raw.matches(Regex("""^\d{6,}$"""))) return null
return raw
Comment on lines +435 to +438
Copy link
Copy Markdown
Owner

@JoshAtticus JoshAtticus May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Reject Photo Picker synthetic IDs (e.g. "1000040501") — these are MediaStore IDs,
// not real filenames. The picker hides the actual name for privacy on Android 13+.
if (raw.isNullOrBlank() || raw.matches(Regex("""^\d{6,}$"""))) return null
return raw

Please remove this, it's not needed

}

private fun sanitizeFilename(name: String): String =
name.replace(Regex("""[/\\:*?"<>|\x00-\x1F]"""), "_").trim().ifBlank { "Video" }

private fun makeOutputName(originalName: String?): String {
val base = originalName?.substringBeforeLast(".")?.takeIf { it.isNotBlank() }
?.let { sanitizeFilename(it) }
?: "Video_${System.currentTimeMillis()}"
return "${base}_Compressed.mp4"
}

fun updateSelectedUri(context: Context, uri: Uri) {
// Resolve the display name independently — if metadata extraction throws below
// (HDR videos, unsupported codecs, slow URIs), we still keep the original name.
val originalName = queryDisplayName(context, uri)

Copy link
Copy Markdown
Owner

@JoshAtticus JoshAtticus May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unneeded linebreak

var size = 0L
var width = 0
var height = 0
Expand All @@ -425,8 +461,7 @@ class CompressorViewModel(application: Application) : AndroidViewModel(applicati
var fps = 30f
var videoMime: String? = null
var duration = 0L
var originalName: String? = null


try {
audioBitrate = getAudioBitrate(context, uri)
val videoInfo = getVideoTrackInfo(context, uri)
Expand Down Expand Up @@ -460,15 +495,6 @@ class CompressorViewModel(application: Application) : AndroidViewModel(applicati
fps = 30f
}

val cursor = context.contentResolver.query(uri, null, null, null, null)
if (cursor != null && cursor.moveToFirst()) {
val nameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME)
if (nameIndex != -1) {
originalName = cursor.getString(nameIndex)
}
cursor.close()
}

retriever.release()
} catch (e: Exception) {
e.printStackTrace()
Expand Down Expand Up @@ -713,8 +739,7 @@ class CompressorViewModel(application: Application) : AndroidViewModel(applicati

val outputDir = File(context.cacheDir, "compressed_videos")
outputDir.mkdirs()
val baseName = currentState.originalName?.substringBeforeLast(".") ?: "Compressed_${System.currentTimeMillis()}"
val outputFile = File(outputDir, "${baseName}_Compressed.mp4")
val outputFile = File(outputDir, makeOutputName(currentState.originalName))
if (outputFile.exists()) {
outputFile.delete()
}
Expand Down Expand Up @@ -1117,12 +1142,7 @@ class CompressorViewModel(application: Application) : AndroidViewModel(applicati
return@launch
}

val targetName = if (currentState.originalName != null) {
val nameWithoutExt = currentState.originalName.substringBeforeLast(".")
"${nameWithoutExt}_Compressed.mp4"
} else {
"Compressed_${System.currentTimeMillis()}.mp4"
}
val targetName = makeOutputName(currentState.originalName)

val values = ContentValues().apply {
put(MediaStore.Video.Media.DISPLAY_NAME, targetName)
Expand Down
11 changes: 8 additions & 3 deletions app/src/main/java/compress/joshattic/us/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.compose.animation.AnimatedContent
Expand Down Expand Up @@ -160,8 +159,14 @@ fun CompressorApp(viewModel: CompressorViewModel) {
}
}

val pickMedia = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
// SAF-based picker — preserves the real file name (Photo Picker hides it for privacy on API 33+).
val pickMedia = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
if (uri != null) {
try {
context.contentResolver.takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
} catch (_: SecurityException) {
// Some providers don't grant persistable URIs; the URI is still readable for this session.
Copy link
Copy Markdown
Owner

@JoshAtticus JoshAtticus May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

???

Is this tested? There shouldn't be any SecurityExceptions

}
viewModel.updateSelectedUri(context, uri)
}
}
Expand Down Expand Up @@ -241,7 +246,7 @@ fun CompressorApp(viewModel: CompressorViewModel) {
when(index) {
0 -> EmptyScreen(
totalSaved = state.formattedTotalSaved,
onPick = { pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.VideoOnly)) }
onPick = { pickMedia.launch(arrayOf("video/*")) }
)
2 -> {
if (state.error != null) {
Expand Down
Loading