Fix bug reporter failing after not finding some files (#1103)

- Make sure we propagate `CancellationException`.
- Make sure we do a cleanup of temp files.
- Make sure we don't re-compress any lingering temp files.
- Don't stop the upload process if we were able to upload some log files, even if we failed to read some others.

changelog.d/1082.bugfix

@@ -0,0 +1 @@
+Fix bug reporter failing after not finding some log files.

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

@@ -40,6 +40,7 @@ import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.network.useragent.UserAgentProvider
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.services.toolbox.api.systemclock.SystemClock
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
@@ -152,6 +153,8 @@ class DefaultBugReporter @Inject constructor(
         // enumerate files to delete
         val mBugReportFiles: MutableList<File> = ArrayList()
 
+        try {
+
             var serverError: String? = null
             var reportURL: String? = null
             withContext(coroutineDispatchers.io) {
@@ -168,10 +171,10 @@ class DefaultBugReporter @Inject constructor(
                 if (withDevicesLogs) {
                     val files = getLogFiles()
                     files.mapNotNullTo(gzippedFiles) { f ->
-                    if (!mIsCancelled) {
+                        when {
-                        compressFile(f)
+                            mIsCancelled -> null
-                    } else {
+                            f.extension == "gz" -> f
-                        null
+                            else -> compressFile(f)
                         }
                     }
                     files.deleteAllExceptMostRecent()
@@ -252,9 +255,21 @@ class DefaultBugReporter @Inject constructor(
                             }
                         }
 
-                // add the gzipped files
+                    // add the gzipped files, don't cancel the whole upload if only some file failed to upload
+                    var uploadedSomeLogs = false
                     for (file in gzippedFiles) {
+                        try {
                             builder.addFormDataPart("compressed-log", file.name, file.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull()))
+                            uploadedSomeLogs = true
+                        } catch (e: CancellationException) {
+                            throw e
+                        } catch (e: Exception) {
+                            Timber.e(e, "## sendBugReport() : fail to attach file ${file.name}")
+                        }
+                    }
+
+                    if (!uploadedSomeLogs) {
+                        error("Couldn't upload any logs")
                     }
 
                     mBugReportFiles.addAll(gzippedFiles)
@@ -347,6 +362,8 @@ class DefaultBugReporter @Inject constructor(
                         mBugReportCall = okHttpClient.get().newCall(request)
                         response = mBugReportCall!!.execute()
                         responseCode = response.code
+                    } catch (e: CancellationException) {
+                        throw e
                     } catch (e: Exception) {
                         Timber.e(e, "response")
                         errorMessage = e.localizedMessage
@@ -377,6 +394,8 @@ class DefaultBugReporter @Inject constructor(
                                     try {
                                         val responseJSON = JSONObject(it)
                                         serverError = responseJSON.getString("error")
+                                    } catch (e: CancellationException) {
+                                        throw e
                                     } catch (e: JSONException) {
                                         Timber.e(e, "doInBackground ; Json conversion failed")
                                     }
@@ -386,6 +405,8 @@ class DefaultBugReporter @Inject constructor(
                                 if (null == serverError) {
                                     serverError = "Failed with error $responseCode"
                                 }
+                            } catch (e: CancellationException) {
+                                throw e
                             } catch (e: Exception) {
                                 Timber.e(e, "## sendBugReport() : failed to parse error")
                             }
@@ -403,11 +424,6 @@ class DefaultBugReporter @Inject constructor(
             withContext(coroutineDispatchers.main) {
                 mBugReportCall = null
 
-            // delete when the bug report has been successfully sent
-            for (file in mBugReportFiles) {
-                file.safeDelete()
-            }
-
                 if (null != listener) {
                     try {
                         if (mIsCancelled) {
@@ -417,11 +433,19 @@ class DefaultBugReporter @Inject constructor(
                         } else {
                             listener.onUploadFailed(serverError)
                         }
+                    } catch (e: CancellationException) {
+                        throw e
                     } catch (e: Exception) {
                         Timber.e(e, "## onPostExecute() : failed")
                     }
                 }
             }
+        } finally {
+            // delete the generated files when the bug report process has finished
+            for (file in mBugReportFiles) {
+                file.safeDelete()
+            }
+        }
     }
 
     /**