From f2f15ed7e4ade372ad6e4c78ad9abe2758ce8c3f Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 18 Aug 2021 12:33:37 +0200
Subject: [PATCH] Add some note to bug reports for SchildiChat

Change-Id: I2e0360ba041e06bdccfe069b0ea0d62f33afe42f
---
 .../app/features/rageshake/BugReportActivity.kt   |  8 ++++----
 .../src/main/res/layout/activity_bug_report.xml   | 15 +++++++++++++++
 vector/src/main/res/values/strings_sc.xml         |  2 ++
 3 files changed, 21 insertions(+), 4 deletions(-)

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 27adefd50f..396a2afc66 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
@@ -71,14 +71,14 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
         when (reportType) {
             ReportType.BUG_REPORT -> {
                 supportActionBar?.setTitle(R.string.title_activity_bug_report)
-                views.bugReportButtonContactMe.isVisible = true
+                //views.bugReportButtonContactMe.isVisible = true
             }
             ReportType.SUGGESTION -> {
                 supportActionBar?.setTitle(R.string.send_suggestion)
 
                 views.bugReportFirstText.setText(R.string.send_suggestion_content)
                 views.bugReportTextInputLayout.hint = getString(R.string.send_suggestion_report_placeholder)
-                views.bugReportButtonContactMe.isVisible = true
+                //views.bugReportButtonContactMe.isVisible = true
 
                 hideBugReportOptions()
             }
@@ -87,7 +87,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
                 views.bugReportFirstText.setText(R.string.send_feedback_space_info)
                 views.bugReportTextInputLayout.hint = getString(R.string.feedback)
-                views.bugReportButtonContactMe.isVisible = true
+                //views.bugReportButtonContactMe.isVisible = true
 
                 hideBugReportOptions()
             }
@@ -162,7 +162,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                 views.bugReportButtonIncludeScreenshot.isChecked,
                 views.bugReportEditText.text.toString(),
                 state.serverVersion,
-                views.bugReportButtonContactMe.isChecked,
+                false, //views.bugReportButtonContactMe.isChecked,
                 object : BugReporter.IMXBugReportListener {
                     override fun onUploadFailed(reason: String?) {
                         try {
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 8943912ca4..4181216a44 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -101,6 +101,19 @@
                     android:text="@string/send_bug_report_description_in_english"
                     android:textColor="?vctr_content_secondary" />
 
+                <TextView
+                    android:id="@+id/bug_report_sc_extra"
+                    style="@style/Widget.Vector.TextView.Body"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:text="@string/send_bug_report_sc_extra"
+                    android:linksClickable="true"
+                    android:autoLink="web"
+                    android:textColor="?vctr_content_primary" />
+
                 <TextView
                     android:id="@+id/bug_report_logs_description"
                     style="@style/Widget.Vector.TextView.Body"
@@ -139,6 +152,7 @@
                     android:checked="false"
                     android:text="@string/send_bug_report_include_key_share_history" />
 
+                <!--
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/bug_report_button_contact_me"
                     android:layout_width="match_parent"
@@ -147,6 +161,7 @@
                     android:layout_marginEnd="10dp"
                     android:checked="false"
                     android:text="@string/you_may_contact_me" />
+                    -->
 
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/bug_report_button_include_screenshot"
diff --git a/vector/src/main/res/values/strings_sc.xml b/vector/src/main/res/values/strings_sc.xml
index d11b50ad0e..e8dd5c6ae5 100644
--- a/vector/src/main/res/values/strings_sc.xml
+++ b/vector/src/main/res/values/strings_sc.xml
@@ -112,4 +112,6 @@
     <string name="sc_accent_blue">Blue</string>
     <!-- do not change this comment for accent generation -->
 
+    <string name="send_bug_report_sc_extra">To increase the visibility of your issue and to allow us to contact you, you may want to reference this report (by providing your matrix ID and the approximate time when it was sent) in an issue at https://github.com/SchildiChat/SchildiChat-android/issues (check first if one already exists for your issue, and only create a new one if there is not).</string>
+
 </resources>