Re-enable rageshake / bug reporting
Change-Id: I1803b5dab2348d22c626d920c4b7b820523f62c6
This commit is contained in:
parent
23e98eadd3
commit
1db1423ea2
|
@ -377,7 +377,6 @@ class HomeActivity :
|
||||||
|
|
||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
when (item.itemId) {
|
when (item.itemId) {
|
||||||
/*
|
|
||||||
R.id.menu_home_suggestion -> {
|
R.id.menu_home_suggestion -> {
|
||||||
bugReporter.openBugReportScreen(this, true)
|
bugReporter.openBugReportScreen(this, true)
|
||||||
return true
|
return true
|
||||||
|
@ -386,7 +385,6 @@ class HomeActivity :
|
||||||
bugReporter.openBugReportScreen(this, false)
|
bugReporter.openBugReportScreen(this, false)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
R.id.menu_home_init_sync_legacy -> {
|
R.id.menu_home_init_sync_legacy -> {
|
||||||
// Configure the SDK
|
// Configure the SDK
|
||||||
initialSyncStrategy = InitialSyncStrategy.Legacy
|
initialSyncStrategy = InitialSyncStrategy.Legacy
|
||||||
|
|
|
@ -246,7 +246,7 @@ class BugReporter @Inject constructor(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mIsCancelled) {
|
if (!mIsCancelled) {
|
||||||
val text = "[Element] " +
|
val text = "[SchildiChat] " +
|
||||||
if (forSuggestion) {
|
if (forSuggestion) {
|
||||||
"[Suggestion] "
|
"[Suggestion] "
|
||||||
} else {
|
} else {
|
||||||
|
@ -257,7 +257,7 @@ class BugReporter @Inject constructor(
|
||||||
// build the multi part request
|
// build the multi part request
|
||||||
val builder = BugReporterMultipartBody.Builder()
|
val builder = BugReporterMultipartBody.Builder()
|
||||||
.addFormDataPart("text", text)
|
.addFormDataPart("text", text)
|
||||||
.addFormDataPart("app", "riot-android")
|
.addFormDataPart("app", "schildichat-android")
|
||||||
.addFormDataPart("user_agent", Matrix.getInstance(context).getUserAgent())
|
.addFormDataPart("user_agent", Matrix.getInstance(context).getUserAgent())
|
||||||
.addFormDataPart("user_id", userId)
|
.addFormDataPart("user_id", userId)
|
||||||
.addFormDataPart("device_id", deviceId)
|
.addFormDataPart("device_id", deviceId)
|
||||||
|
@ -319,7 +319,7 @@ class BugReporter @Inject constructor(
|
||||||
builder.addFormDataPart("label", context.getString(R.string.git_branch_name))
|
builder.addFormDataPart("label", context.getString(R.string.git_branch_name))
|
||||||
|
|
||||||
// Special for RiotX
|
// Special for RiotX
|
||||||
builder.addFormDataPart("label", "[Element]")
|
builder.addFormDataPart("label", "[SchildiChat]")
|
||||||
|
|
||||||
// Suggestion
|
// Suggestion
|
||||||
if (forSuggestion) {
|
if (forSuggestion) {
|
||||||
|
|
|
@ -861,7 +861,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
|
||||||
* @return true if the rage shake is used
|
* @return true if the rage shake is used
|
||||||
*/
|
*/
|
||||||
fun useRageshake(): Boolean {
|
fun useRageshake(): Boolean {
|
||||||
return false; //defaultPrefs.getBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, false)
|
return defaultPrefs.getBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -109,12 +109,12 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
|
||||||
} else {
|
} else {
|
||||||
views.toubleshootSummDescription.text = getString(R.string.settings_troubleshoot_diagnostic_failure_status_no_quickfix)
|
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
|
views.troubleshootRunButton.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
TroubleshootTest.TestStatus.SUCCESS -> {
|
TroubleshootTest.TestStatus.SUCCESS -> {
|
||||||
views.toubleshootSummDescription.text = getString(R.string.settings_troubleshoot_diagnostic_success_status)
|
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
|
views.troubleshootRunButton.visibility = View.VISIBLE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
android:title="@string/settings"
|
android:title="@string/settings"
|
||||||
app:showAsAction="never" />
|
app:showAsAction="never" />
|
||||||
|
|
||||||
<!--
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_home_suggestion"
|
android:id="@+id/menu_home_suggestion"
|
||||||
android:icon="@drawable/ic_material_bug_report"
|
android:icon="@drawable/ic_material_bug_report"
|
||||||
|
@ -19,7 +18,6 @@
|
||||||
android:id="@+id/menu_home_report_bug"
|
android:id="@+id/menu_home_report_bug"
|
||||||
android:icon="@drawable/ic_material_bug_report"
|
android:icon="@drawable/ic_material_bug_report"
|
||||||
android:title="@string/send_bug_report" />
|
android:title="@string/send_bug_report" />
|
||||||
-->
|
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_home_init_sync_legacy"
|
android:id="@+id/menu_home_init_sync_legacy"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<!-- server urls -->
|
<!-- server urls -->
|
||||||
<string name="matrix_org_server_url" translatable="false">https://matrix.org</string>
|
<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="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
|
Pusher config for the application
|
||||||
|
|
|
@ -40,8 +40,7 @@
|
||||||
|
|
||||||
<im.vector.app.core.preference.VectorPreferenceCategory
|
<im.vector.app.core.preference.VectorPreferenceCategory
|
||||||
android:key="SETTINGS_RAGE_SHAKE_CATEGORY_KEY"
|
android:key="SETTINGS_RAGE_SHAKE_CATEGORY_KEY"
|
||||||
android:title="@string/settings_rageshake"
|
android:title="@string/settings_rageshake">
|
||||||
android:enabled="false">
|
|
||||||
|
|
||||||
<im.vector.app.core.preference.VectorSwitchPreference
|
<im.vector.app.core.preference.VectorSwitchPreference
|
||||||
android:defaultValue="false"
|
android:defaultValue="false"
|
||||||
|
|
Loading…
Reference in New Issue