From e4c0883312fb8c228763122ad57e6cc8a658a5f0 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 7 Apr 2022 15:15:29 +0200
Subject: [PATCH] Rageshake: add field about what debug settings to expect
Change-Id: Idd9a1954e80c24ed58bf8e1f2b93ecb7cd211407
---
.../src/main/java/de/spiritcroc/matrixsdk/util/DbgUtil.kt | 2 +-
.../main/java/im/vector/app/features/rageshake/BugReporter.kt | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/matrix-sdk-android/src/main/java/de/spiritcroc/matrixsdk/util/DbgUtil.kt b/matrix-sdk-android/src/main/java/de/spiritcroc/matrixsdk/util/DbgUtil.kt
index 091c18d2e1..78f8127dba 100644
--- a/matrix-sdk-android/src/main/java/de/spiritcroc/matrixsdk/util/DbgUtil.kt
+++ b/matrix-sdk-android/src/main/java/de/spiritcroc/matrixsdk/util/DbgUtil.kt
@@ -14,7 +14,7 @@ object DbgUtil {
private val prefs = HashMap<String, Boolean>()
- private val ALL_PREFS = arrayOf(
+ val ALL_PREFS = arrayOf(
DBG_READ_MARKER,
DBG_SHOW_READ_TRACKING,
DBG_TIMELINE_CHUNKS,
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 35d50eaee0..2da44d1b86 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -25,6 +25,7 @@ import android.view.View
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
import com.squareup.moshi.Types
+import de.spiritcroc.matrixsdk.util.DbgUtil
import im.vector.app.BuildConfig
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
@@ -300,7 +301,10 @@ class BugReporter @Inject constructor(
.addFormDataPart("unifiedpush_gateway", UPHelper.getPushGateway(context).toString())
.addFormDataPart("unifiedpush_distributor_exists", UPHelper.distributorExists(context).toString())
.addFormDataPart("unifiedpush_is_embedded_distributor", UPHelper.isEmbeddedDistributor(context).toString())
+
// More Schildi-specific fields
+ val enabledDebugSettings = DbgUtil.ALL_PREFS.filter { DbgUtil.isDbgEnabled(it) }
+ builder.addFormDataPart("enabledDebugSettings", enabledDebugSettings.joinToString())
.addFormDataPart("reportTime", reportTime)
.addFormDataPart("packageName", BuildConfig.APPLICATION_ID)