GitHub-Mirror/riotX-android
1
0
Fork 1
mirror of https://github.com/vector-im/riotX-android synced 2025-10-05 15:52:47 +02:00
Code Issues Releases Wiki Activity

Merge pull request #9058 from element-hq/bca/hide_manually_verify_behind_flag

Browse Source 
Hide the `Manually Verify by Text` option behind devtool flag
This commit is contained in:
ganfra
2025-08-06 14:24:01 +02:00
committed by GitHub
parent d63fc0b397 d26a25a4f8
commit 69af25a829
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9058.misc Normal file
View File

@@ -0,0 +1 @@
Hide the "Manually Verify by Text" option behind devtool flag.

28
vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
View File

@@ -17,6 +17,7 @@ import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.genericItem import im.vector.app.core.ui.list.genericItem
import im.vector.app.core.ui.views.toDrawableRes import im.vector.app.core.ui.views.toDrawableRes
import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
import im.vector.app.features.settings.VectorPreferences
import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
import im.vector.lib.strings.CommonStrings import im.vector.lib.strings.CommonStrings
import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.extensions.orFalse
@@ -26,7 +27,8 @@ import javax.inject.Inject
class DeviceVerificationInfoBottomSheetController @Inject constructor( class DeviceVerificationInfoBottomSheetController @Inject constructor(
private val stringProvider: StringProvider, private val stringProvider: StringProvider,
private val colorProvider: ColorProvider private val colorProvider: ColorProvider,
private val vectorPreferences: VectorPreferences
) : ) :
TypedEpoxyController<DeviceVerificationInfoBottomSheetViewState>() { TypedEpoxyController<DeviceVerificationInfoBottomSheetViewState>() {
@@ -244,17 +246,19 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
private fun addVerifyActions(cryptoDeviceInfo: CryptoDeviceInfo) { private fun addVerifyActions(cryptoDeviceInfo: CryptoDeviceInfo) {
val host = this val host = this
bottomSheetDividerItem { if (vectorPreferences.developerMode()) {
id("verifyDiv") bottomSheetDividerItem {
} id("verifyDiv")
bottomSheetVerificationActionItem { }
id("verify_text") bottomSheetVerificationActionItem {
title(host.stringProvider.getString(CommonStrings.cross_signing_verify_by_text)) id("verify_text")
titleColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary)) title(host.stringProvider.getString(CommonStrings.cross_signing_verify_by_text))
iconRes(R.drawable.ic_arrow_right) titleColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary))
iconColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary)) iconRes(R.drawable.ic_arrow_right)
listener { iconColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary))
host.callback?.onAction(DevicesAction.VerifyMyDeviceManually(cryptoDeviceInfo.deviceId)) listener {
host.callback?.onAction(DevicesAction.VerifyMyDeviceManually(cryptoDeviceInfo.deviceId))
}
} }
} }
bottomSheetDividerItem { bottomSheetDividerItem {