From 979dec75dec50ab6efe1da0fafa8d7a9ad75aa3b Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 13 Jun 2022 18:06:53 +0100
Subject: [PATCH 1/2] making bugreport screenshots opt in instead of optout

---
 changelog.d/6261.misc                              | 1 +
 vector/src/main/res/layout/activity_bug_report.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/6261.misc

diff --git a/changelog.d/6261.misc b/changelog.d/6261.misc
new file mode 100644
index 0000000000..9ae8bf7b17
--- /dev/null
+++ b/changelog.d/6261.misc
@@ -0,0 +1 @@
+Making screenshots in bug reports opt in instead of opt out
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 8943912ca4..1c019c858d 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -154,7 +154,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
-                    android:checked="true"
+                    android:checked="false"
                     android:text="@string/send_bug_report_include_screenshot" />
 
                 <ImageView
@@ -181,4 +181,4 @@
         android:clickable="true"
         android:focusable="true"
         android:visibility="gone" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>

From d8814974c56550ca96cb77c44b8bd368adecb2bb Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 16 Jun 2022 10:58:28 +0100
Subject: [PATCH 2/2] makes the bug report screenshot preview always visible

---
 .../java/im/vector/app/features/rageshake/BugReportActivity.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index 73f82121e8..c761c498d4 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -259,7 +259,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
     }
 
     private fun onSendScreenshotChanged() {
-        views.bugReportScreenshotPreview.isVisible = views.bugReportButtonIncludeScreenshot.isChecked && bugReporter.screenshot != null
+        views.bugReportScreenshotPreview.isVisible = bugReporter.screenshot != null
     }
 
     override fun onBackPressed() {