Skip to content

Hide the Manually Verify by Text option behind devtool flag #9058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2025
Merged

Hide the Manually Verify by Text option behind devtool flag #9058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
856592f
Gate the Manually verify device behind devtool flag
BillCarsonFr Jul 17, 2025
d26a25a
add changelog
BillCarsonFr Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/9058.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hide the "Manually Verify by Text" option behind devtool flag.
28 changes: 16 additions & 12 deletions ...va/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.views.toDrawableRes
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.strings.CommonStrings
import org.matrix.android.sdk.api.extensions.orFalse
Expand All @@ -26,7 +27,8 @@ import javax.inject.Inject

class DeviceVerificationInfoBottomSheetController @Inject constructor(
private val stringProvider: StringProvider,
private val colorProvider: ColorProvider
private val colorProvider: ColorProvider,
private val vectorPreferences: VectorPreferences
) :
TypedEpoxyController<DeviceVerificationInfoBottomSheetViewState>() {

Expand Down Expand Up @@ -244,17 +246,19 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(

private fun addVerifyActions(cryptoDeviceInfo: CryptoDeviceInfo) {
val host = this
bottomSheetDividerItem {
id("verifyDiv")
}
bottomSheetVerificationActionItem {
id("verify_text")
title(host.stringProvider.getString(CommonStrings.cross_signing_verify_by_text))
titleColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary))
iconRes(R.drawable.ic_arrow_right)
iconColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary))
listener {
host.callback?.onAction(DevicesAction.VerifyMyDeviceManually(cryptoDeviceInfo.deviceId))
if (vectorPreferences.developerMode()) {
bottomSheetDividerItem {
id("verifyDiv")
}
bottomSheetVerificationActionItem {
id("verify_text")
title(host.stringProvider.getString(CommonStrings.cross_signing_verify_by_text))
titleColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary))
iconRes(R.drawable.ic_arrow_right)
iconColor(host.colorProvider.getColorFromAttribute(com.google.android.material.R.attr.colorPrimary))
listener {
host.callback?.onAction(DevicesAction.VerifyMyDeviceManually(cryptoDeviceInfo.deviceId))
}
}
}
bottomSheetDividerItem {
Expand Down
Loading