Re-enable rageshake / bug reporting

Change-Id: I1803b5dab2348d22c626d920c4b7b820523f62c6
This commit is contained in:
SpiritCroc 2021-04-24 15:42:54 +02:00
parent 23e98eadd3
commit 1db1423ea2
7 changed files with 8 additions and 13 deletions

View file

@ -377,7 +377,6 @@ class HomeActivity :
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
/*
R.id.menu_home_suggestion -> {
bugReporter.openBugReportScreen(this, true)
return true
@ -386,7 +385,6 @@ class HomeActivity :
bugReporter.openBugReportScreen(this, false)
return true
}
*/
R.id.menu_home_init_sync_legacy -> {
// Configure the SDK
initialSyncStrategy = InitialSyncStrategy.Legacy

View file

@ -246,7 +246,7 @@ class BugReporter @Inject constructor(
}
if (!mIsCancelled) {
val text = "[Element] " +
val text = "[SchildiChat] " +
if (forSuggestion) {
"[Suggestion] "
} else {
@ -257,7 +257,7 @@ class BugReporter @Inject constructor(
// build the multi part request
val builder = BugReporterMultipartBody.Builder()
.addFormDataPart("text", text)
.addFormDataPart("app", "riot-android")
.addFormDataPart("app", "schildichat-android")
.addFormDataPart("user_agent", Matrix.getInstance(context).getUserAgent())
.addFormDataPart("user_id", userId)
.addFormDataPart("device_id", deviceId)
@ -319,7 +319,7 @@ class BugReporter @Inject constructor(
builder.addFormDataPart("label", context.getString(R.string.git_branch_name))
// Special for RiotX
builder.addFormDataPart("label", "[Element]")
builder.addFormDataPart("label", "[SchildiChat]")
// Suggestion
if (forSuggestion) {

View file

@ -861,7 +861,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
* @return true if the rage shake is used
*/
fun useRageshake(): Boolean {
return false; //defaultPrefs.getBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, false)
return defaultPrefs.getBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, false)
}
/**

View file

@ -109,12 +109,12 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
} else {
views.toubleshootSummDescription.text = getString(R.string.settings_troubleshoot_diagnostic_failure_status_no_quickfix)
}
//views.troubleshootSummButton.visibility = View.VISIBLE
views.troubleshootSummButton.visibility = View.VISIBLE
views.troubleshootRunButton.visibility = View.VISIBLE
}
TroubleshootTest.TestStatus.SUCCESS -> {
views.toubleshootSummDescription.text = getString(R.string.settings_troubleshoot_diagnostic_success_status)
//views.troubleshootSummButton.visibility = View.VISIBLE
views.troubleshootSummButton.visibility = View.VISIBLE
views.troubleshootRunButton.visibility = View.VISIBLE
}
}

View file

@ -9,7 +9,6 @@
android:title="@string/settings"
app:showAsAction="never" />
<!--
<item
android:id="@+id/menu_home_suggestion"
android:icon="@drawable/ic_material_bug_report"
@ -19,7 +18,6 @@
android:id="@+id/menu_home_report_bug"
android:icon="@drawable/ic_material_bug_report"
android:title="@string/send_bug_report" />
-->
<item
android:id="@+id/menu_home_init_sync_legacy"

View file

@ -6,7 +6,7 @@
<!-- server urls -->
<string name="matrix_org_server_url" translatable="false">https://matrix.org</string>
<string name="piwik_server_url" translatable="false">https://piwik.nonexistent.localhost</string>
<string name="bug_report_url" translatable="false">https://nonexistent.localhost/bugreports/submit</string>
<string name="bug_report_url" translatable="false">https://s2.spiritcroc.de/api/submit</string>
<!--
Pusher config for the application

View file

@ -40,8 +40,7 @@
<im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_RAGE_SHAKE_CATEGORY_KEY"
android:title="@string/settings_rageshake"
android:enabled="false">
android:title="@string/settings_rageshake">
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="false"