From ba28628bdf63cc6a38b63afb9294566a32e8a201 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 2 Mar 2023 18:06:31 +0100
Subject: [PATCH] [Architecture] clean up

---
 features/onboarding/build.gradle.kts           |  1 -
 .../reporter/BugReporterMultipartBody.java     | 18 +++++++++---------
 .../rageshake/reporter/DefaultBugReporter.kt   | 16 ++++++++--------
 3 files changed, 17 insertions(+), 18 deletions(-)
 rename features/rageshake/src/main/{java => kotlin}/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java (95%)

diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts
index 61e5371095..85016fd90e 100644
--- a/features/onboarding/build.gradle.kts
+++ b/features/onboarding/build.gradle.kts
@@ -30,7 +30,6 @@ anvil {
     generateDaggerFactories.set(true)
 }
 
-
 dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.elementresources)
diff --git a/features/rageshake/src/main/java/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java
similarity index 95%
rename from features/rageshake/src/main/java/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java
rename to features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java
index fdd858abfd..aa499c3f86 100755
--- a/features/rageshake/src/main/java/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java
+++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporterMultipartBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public class BugReporterMultipartBody extends RequestBody {
         /**
          * Upload listener
          *
-         * @param totalWritten total written bytes
+         * @param totalWritten  total written bytes
          * @param contentLength content length
          */
         void onWrite(long totalWritten, long contentLength);
@@ -132,24 +132,24 @@ public class BugReporterMultipartBody extends RequestBody {
             if (headers != null) {
                 for (int h = 0, headerCount = headers.size(); h < headerCount; h++) {
                     sink.writeUtf8(headers.name(h))
-                            .write(COLONSPACE)
-                            .writeUtf8(headers.value(h))
-                            .write(CRLF);
+                        .write(COLONSPACE)
+                        .writeUtf8(headers.value(h))
+                        .write(CRLF);
                 }
             }
 
             MediaType contentType = body.contentType();
             if (contentType != null) {
                 sink.writeUtf8("Content-Type: ")
-                        .writeUtf8(contentType.toString())
-                        .write(CRLF);
+                    .writeUtf8(contentType.toString())
+                    .write(CRLF);
             }
 
             int contentLength = (int) body.contentLength();
             if (contentLength != -1) {
                 sink.writeUtf8("Content-Length: ")
-                        .writeUtf8(contentLength + "")
-                        .write(CRLF);
+                    .writeUtf8(contentLength + "")
+                    .write(CRLF);
             } else if (countBytes) {
                 // We can't measure the body's size without the sizes of its components.
                 byteCountBuffer.clear();
diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/DefaultBugReporter.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/DefaultBugReporter.kt
index cfc0c68561..97acad889b 100755
--- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/DefaultBugReporter.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/DefaultBugReporter.kt
@@ -260,15 +260,15 @@ class DefaultBugReporter @Inject constructor(
                             ?.toUri()
                             ?.toFile()
                             ?.let { screenshotFile ->
-                            try {
-                                builder.addFormDataPart(
-                                    "file",
-                                    screenshotFile.name, screenshotFile.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull())
-                                )
-                            } catch (e: Exception) {
-                                Timber.e(e, "## sendBugReport() : fail to write screenshot")
+                                try {
+                                    builder.addFormDataPart(
+                                        "file",
+                                        screenshotFile.name, screenshotFile.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull())
+                                    )
+                                } catch (e: Exception) {
+                                    Timber.e(e, "## sendBugReport() : fail to write screenshot")
+                                }
                             }
-                        }
                     }
 
                     // add some github labels