Skip to content

fix: oom video issue #21

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
bepo00 merged 3 commits into from
Apr 18, 2026
Merged

fix: oom video issue #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84e12b5
fix oom issue when handling files and media
bepo00 Apr 18, 2026
5178e75
cleanup
bepo00 Apr 18, 2026
88141c1
additional size check after copy
bepo00 Apr 18, 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
22 changes: 0 additions & 22 deletions app/src/main/java/com/qlarr/app/ui/survey/EMNavProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,28 +394,6 @@ class EMNavProcessor(
)
}

fun uploadFile(
key: String,
fileName: String,
byteArray: ByteArray,
): ResponseUploadFile {
val uuid = UUID.randomUUID().toString()
val responseFile =
FileUtils.getResponseFile(
context = getActivity(),
fileName = uuid,
surveyId = survey.id,
responseId = responseId.toString(),
)
responseFile.writeBytes(byteArray)
return saveFileResponse(
fileName = fileName,
storedFilename = uuid,
key = key,
fileSize = responseFile.length(),
)
}

fun saveFileResponse(
fileName: String,
storedFilename: String,
Expand Down
108 changes: 64 additions & 44 deletions app/src/main/java/com/qlarr/app/ui/survey/QlarrWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,19 +313,24 @@ constructor(
key: String,
fileName: String,
) {
context.contentResolver.openInputStream(saverUri!!)?.let {
it.use { stream ->
val uploadFile =
emNavProcessor.uploadFile(
key,
fileName,
stream.readBytes(),
)
val string = objectMapper.writeValueAsString(uploadFile)
resetFileUploadVariables()
loadUrlOnUiThread("javascript:onFileUploaded($string)")
val uri = saverUri ?: return
val uuid = UUID.randomUUID().toString()
CoroutineScope(Dispatchers.IO).launch {
val dest = FileUtils.getResponseFile(context, uuid, survey.id, responseId!!)
context.contentResolver.openInputStream(uri)?.use { input ->
dest.outputStream().use { input.copyTo(it) }
}
val uploadFile =
emNavProcessor.saveFileResponse(
fileName = fileName,
storedFilename = uuid,
fileSize = dest.length(),
key = key,
)
val string = objectMapper.writeValueAsString(uploadFile)
resetFileUploadVariables()
loadUrlOnUiThread("javascript:onFileUploaded($string)")
}
}
}

@JavascriptInterface
Expand Down Expand Up @@ -412,14 +417,15 @@ constructor(
emNavProcessor =
EMNavProcessor(context, survey) {
loadDataWithBaseURL(CUSTOM_DOMAIN, data, null, null, null)
}
}
}
}

fun onCameraResult() {
context.contentResolver.openInputStream(saverUri!!)?.use { stream ->
val size = stream.readBytes().size.toLong()
fun onCameraResult() {
val uri = saverUri ?: return
val uuid = uri.toString().substringAfterLast("/").substringBefore(".")
val file = FileUtils.getResponseFile(context, uuid, survey.id, responseId!!)
val size = file.length()
val shouldCompress = isSizeViolated(size, true)
val uuid = saverUri.toString().substringAfterLast("/").substringBefore(".")
val key = operationKey!!
CoroutineScope(Dispatchers.IO).launch {
val result =
Expand All @@ -431,15 +437,7 @@ constructor(
)
val finalSize =
if (shouldCompress) {
compress(
FileUtils.getResponseFile(
context,
uuid.toString(),
survey.id,
responseId!!,
),
maxSizeKb!! * 1024L,
)
compress(file, maxSizeKb!! * 1024L)
} else {
result.size
}
Expand All @@ -451,7 +449,6 @@ constructor(
})",
)
resetFileUploadVariables()
}
}
}

Expand All @@ -470,31 +467,48 @@ constructor(

fun onBarcodeScanned(contents: String) {
loadUrlOnUiThread("javascript:onBarcodeScanned$operationKey(\"$contents\")")
}

private fun loadUrlOnUiThread(url: String) {
(context as Activity).runOnUiThread {
loadUrl(url)
}
}

fun onVideoResult(contentUri: Uri?) {
val stream = context.contentResolver.openInputStream(contentUri!!)
private fun loadUrlOnUiThread(url: String) {
(context as Activity).runOnUiThread {
loadUrl(url)
}
}

stream?.use {
val byteArray = stream.readBytes()
val size = byteArray.size.toLong()
if (isSizeViolated(size)) {
fun onVideoResult(contentUri: Uri?) {
val uri = contentUri ?: return
val querySize = queryContentSize(uri)
if (querySize != null && isSizeViolated(querySize)) {
resetFileUploadVariables()
return
}
val key = operationKey!!
val uuid = UUID.randomUUID().toString()
val maxKb = maxSizeKb
CoroutineScope(Dispatchers.IO).launch {
val dest = FileUtils.getResponseFile(context, uuid, survey.id, responseId!!)
context.contentResolver.openInputStream(uri)?.use { input ->
dest.outputStream().use { input.copyTo(it) }
}
val actualSize = dest.length()
if (maxKb != null && actualSize / 1024 > maxKb) {
dest.delete()
(context as Activity).runOnUiThread {
surveyActivity?.showMaxSizeValidation(
(actualSize / 1024).toInt(),
maxKb,
false,
)
}
resetFileUploadVariables()
return@launch
}
val result =
emNavProcessor.uploadFile(
key = key,
emNavProcessor.saveFileResponse(
fileName = "captured-video.mp4",
byteArray = byteArray,
storedFilename = uuid,
fileSize = actualSize,
key = key,
)
loadUrlOnUiThread(
"javascript:onVideoCaptured$key(${
Expand All @@ -506,7 +520,13 @@ constructor(
resetFileUploadVariables()
}
}
}

private fun queryContentSize(uri: Uri): Long? =
context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
if (!cursor.moveToFirst()) return@use null
val idx = cursor.getColumnIndex(OpenableColumns.SIZE)
if (idx == -1 || cursor.isNull(idx)) null else cursor.getLong(idx)
}

private fun isSizeViolated(
size: Long,
Expand Down
Loading