From df3d3b63c88d5df7316cb2dd30d8a9ad6af49b73 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 12 May 2021 11:04:54 +0200
Subject: [PATCH] Code review

---
 .../app/features/rageshake/BugReportActivity.kt   | 15 +++++----------
 vector/src/main/res/values/strings.xml            |  8 +++-----
 2 files changed, 8 insertions(+), 15 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 2b7c3db490..d6d80673b0 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,7 +71,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
         when (reportType) {
             ReportType.BUG_REPORT -> {
                 supportActionBar?.setTitle(R.string.title_activity_bug_report)
-                views.bugReportButtonContactMe.isVisible = false
+                views.bugReportButtonContactMe.isVisible = true
             }
             ReportType.SUGGESTION -> {
                 supportActionBar?.setTitle(R.string.send_suggestion)
@@ -172,13 +172,10 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                                         Toast.makeText(this@BugReportActivity,
                                                 getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
                                     }
-                                    ReportType.SUGGESTION          -> {
-                                        Toast.makeText(this@BugReportActivity,
-                                                getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
-                                    }
+                                    ReportType.SUGGESTION,
                                     ReportType.SPACE_BETA_FEEDBACK -> {
                                         Toast.makeText(this@BugReportActivity,
-                                                getString(R.string.space_feedback_failed, reason), Toast.LENGTH_LONG).show()
+                                                getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG).show()
                                     }
                                 }
                             }
@@ -211,11 +208,9 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                                 ReportType.BUG_REPORT          -> {
                                     Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show()
                                 }
-                                ReportType.SUGGESTION          -> {
-                                    Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show()
-                                }
+                                ReportType.SUGGESTION,
                                 ReportType.SPACE_BETA_FEEDBACK -> {
-                                    Toast.makeText(this@BugReportActivity, R.string.space_feedback_sent, Toast.LENGTH_LONG).show()
+                                    Toast.makeText(this@BugReportActivity, R.string.feedback_sent, Toast.LENGTH_LONG).show()
                                 }
                             }
                         } catch (e: Exception) {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 6c46600f43..48e53419d9 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2164,15 +2164,13 @@
     <string name="send_suggestion">Make a suggestion</string>
     <string name="send_suggestion_content">Please write your suggestion below.</string>
     <string name="send_suggestion_report_placeholder">Describe your suggestion here</string>
-    <string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
-    <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
 
     <string name="send_feedback_space_title">Spaces feedback</string>
     <string name="feedback">Feedback</string>
-    <string name="send_feedback_space_info">You’re using a beta version of spaces.  Your feedback will help inform the next versions.  Your platform and username will be noted to help us use your feedback as much as we can. To leave the beta, visit your settings.</string>
+    <string name="send_feedback_space_info">You’re using a beta version of spaces. Your feedback will help inform the next versions. Your platform and username will be noted to help us use your feedback as much as we can.</string>
     <string name="you_may_contact_me">You may contact me if you have any follow up questions</string>
-    <string name="space_feedback_sent">Thanks, your feedback has been successfully sent</string>
-    <string name="space_feedback_failed">The feedback failed to be sent (%s)</string>
+    <string name="feedback_sent">Thanks, your feedback has been successfully sent</string>
+    <string name="feedback_failed">The feedback failed to be sent (%s)</string>
     <string name="give_feedback">Give Feedback</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>