letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #6027 from element-hq/feature/bma/improveRageshake

Browse Source 
Let rageshake description mention when a log file is missing
This commit is contained in:
Benoit Marty
2026-01-19 09:22:20 +01:00
committed by GitHub
parent ae76e8b0ea de8d3aa695
commit 2534cd27e0
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt
View File

@@ -139,7 +139,7 @@ class PreferencesRootPresenter(
return PreferencesRootState(
myUser = matrixUser.value,
version = versionFormatter.get(),
version = remember { versionFormatter.get() },
deviceId = matrixClient.deviceId,
isMultiAccountEnabled = isMultiAccountEnabled,
otherSessions = otherSessions,

14
features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
View File

@@ -147,14 +147,19 @@ class DefaultBugReporter(
}
}
val gzippedFiles = mutableListOf<File>()
var filesTooBig = 0
if (withDevicesLogs) {
val files = getLogFiles().sortedByDescending { it.lastModified() }
files.mapNotNullTo(gzippedFiles) { file ->
val filesBySize = files.groupBy {
it.length() < RageshakeConfig.MAX_LOG_CONTENT_SIZE
}
filesBySize[true].orEmpty().mapNotNullTo(gzippedFiles) { file ->
when {
file.extension == "gz" -> file
else -> compressFile(file)
}
}
filesTooBig = filesBySize[false].orEmpty().size
}
if (withCrashLogs || withDevicesLogs) {
saveLogCat()
@@ -192,7 +197,9 @@ class DefaultBugReporter(
.addFormDataPart("label", buildMeta.versionName)
.addFormDataPart("label", buildMeta.flavorDescription)
.addFormDataPart("branch_name", buildMeta.gitBranchName)
if (filesTooBig > 0) {
builder.addFormDataPart("omitted_logs", filesTooBig.toString())
}
userId?.let {
matrixClientProvider.getOrNull(it)?.let { client ->
val curveKey = client.encryptionService.deviceCurve25519()
@@ -394,8 +401,7 @@ class DefaultBugReporter(
logDirectory.listFiles()
?.filter {
it.isFile &&
!it.name.endsWith(LOG_CAT_FILENAME) &&
it.length() < RageshakeConfig.MAX_LOG_CONTENT_SIZE
!it.name.endsWith(LOG_CAT_FILENAME)
}
}.orEmpty()
}