From 4a88e3fab68424433abe4fff6d3d11812d469a3a Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Wed, 30 Aug 2023 12:49:58 +0200 Subject: [PATCH] Bug reporter crashes when 'send logs' is disabled. (#1184) * Bug reporter crashes when 'send logs' is disabled. * Make sure generated files are cleaned up when uploading the logs fails. --- changelog.d/1168.bugfix | 1 + .../rageshake/impl/reporter/DefaultBugReporter.kt | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelog.d/1168.bugfix diff --git a/changelog.d/1168.bugfix b/changelog.d/1168.bugfix new file mode 100644 index 0000000000..f7f959ac0a --- /dev/null +++ b/changelog.d/1168.bugfix @@ -0,0 +1 @@ +Bug reporter crashes when 'send logs' is disabled. diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt index ad7f58a239..46ccc7fc56 100755 --- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt +++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt @@ -268,12 +268,13 @@ class DefaultBugReporter @Inject constructor( } } - if (!uploadedSomeLogs) { - error("Couldn't upload any logs") - } - mBugReportFiles.addAll(gzippedFiles) + if (gzippedFiles.isNotEmpty() && !uploadedSomeLogs) { + serverError = "Couldn't upload any logs, please retry." + return@withContext + } + if (withScreenshot) { screenshotHolder.getFileUri() ?.toUri()