Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #837 from vector-im/feature/bma/rageshakeMxid

Browse source 
Add userId to rageshake summary
This commit is contained in:
Benoit Marty 2023-07-10 16:21:51 +02:00 • committed by GitHub
commit 2f00a3595a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/rageshake/impl/build.gradle.kts
View file

@ -38,6 +38,7 @@ dependencies {
implementation(projects.libraries.architecture) implementation(projects.libraries.architecture)
implementation(projects.libraries.designsystem) implementation(projects.libraries.designsystem)
implementation(projects.libraries.uiStrings) implementation(projects.libraries.uiStrings)
implementation(projects.libraries.sessionStorage.api)
api(libs.squareup.seismic) api(libs.squareup.seismic)
api(projects.features.rageshake.api) api(projects.features.rageshake.api)
implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.datastore.preferences)

21
features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
View file

@ -32,10 +32,12 @@ import io.element.android.libraries.androidutils.file.compressFile
import io.element.android.libraries.androidutils.file.safeDelete import io.element.android.libraries.androidutils.file.safeDelete
import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.core.extensions.toOnOff import io.element.android.libraries.core.extensions.toOnOff
import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.core.mimetype.MimeTypes
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.ApplicationContext import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.network.useragent.UserAgentProvider import io.element.android.libraries.network.useragent.UserAgentProvider
import io.element.android.libraries.sessionstorage.api.SessionStore
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import okhttp3.Call import okhttp3.Call
@ -66,14 +68,14 @@ class DefaultBugReporter @Inject constructor(
private val coroutineDispatchers: CoroutineDispatchers, private val coroutineDispatchers: CoroutineDispatchers,
private val okHttpClient: Provider<OkHttpClient>, private val okHttpClient: Provider<OkHttpClient>,
private val userAgentProvider: UserAgentProvider, private val userAgentProvider: UserAgentProvider,
private val sessionStore: SessionStore,
private val buildMeta: BuildMeta,
/* /*
private val activeSessionHolder: ActiveSessionHolder,
private val versionProvider: VersionProvider, private val versionProvider: VersionProvider,
private val vectorPreferences: VectorPreferences, private val vectorPreferences: VectorPreferences,
private val vectorFileLogger: VectorFileLogger, private val vectorFileLogger: VectorFileLogger,
private val systemLocaleProvider: SystemLocaleProvider, private val systemLocaleProvider: SystemLocaleProvider,
private val matrix: Matrix, private val matrix: Matrix,
private val buildMeta: BuildMeta,
private val processInfo: ProcessInfo, private val processInfo: ProcessInfo,
private val sdkIntProvider: BuildVersionSdkIntProvider, private val sdkIntProvider: BuildVersionSdkIntProvider,
private val vectorLocale: VectorLocaleProvider, private val vectorLocale: VectorLocaleProvider,
@ -198,18 +200,11 @@ class DefaultBugReporter @Inject constructor(
?.let { gzippedFiles.add(it) } ?.let { gzippedFiles.add(it) }
*/ */
var deviceId = "undefined" val sessionData = sessionStore.getLatestSession()
var userId = "undefined" val deviceId = sessionData?.deviceId ?: "undefined"
val userId = sessionData?.userId ?: "undefined"
var olmVersion = "undefined" var olmVersion = "undefined"
/*
activeSessionHolder.getSafeActiveSession()?.let { session ->
userId = session.myUserId
deviceId = session.sessionParams.deviceId ?: "undefined"
olmVersion = session.cryptoService().getCryptoVersion(context, true)
}
*/
if (!mIsCancelled) { if (!mIsCancelled) {
val text = when (reportType) { val text = when (reportType) {
ReportType.BUG_REPORT -> bugDescription ReportType.BUG_REPORT -> bugDescription
@ -274,7 +269,7 @@ class DefaultBugReporter @Inject constructor(
} }
// add some github labels // add some github labels
// builder.addFormDataPart("label", buildMeta.versionName) builder.addFormDataPart("label", buildMeta.versionName)
// builder.addFormDataPart("label", buildMeta.flavorDescription) // builder.addFormDataPart("label", buildMeta.flavorDescription)
// builder.addFormDataPart("label", buildMeta.gitBranchName) // builder.addFormDataPart("label", buildMeta.gitBranchName)