empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Release updated linked devices behind feature flag.

Browse source
This commit is contained in:
Michelle Tang 2024-06-10 12:57:28 -07:00 • committed by Greyson Parrelli
parent 98766b9ebb
commit 4b50365fa9
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
View file

@ -160,7 +160,7 @@ class AppSettingsFragment : DSLSettingsFragment(
title = DSLSettingsText.from(R.string.preferences__linked_devices),
icon = DSLSettingsIcon.from(R.drawable.symbol_devices_24),
onClick = {
if (FeatureFlags.linkedDevicesV2()) {
if (FeatureFlags.internalUser()) {
findNavController().safeNavigate(R.id.action_appSettingsFragment_to_linkDeviceFragment)
} else {
findNavController().safeNavigate(R.id.action_appSettingsFragment_to_deviceActivity)

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
View file

@ -94,7 +94,7 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme
.setTitle(R.string.MediaCaptureFragment_device_link_dialog_title)
.setMessage(R.string.MediaCaptureFragment_device_link_dialog_body)
.setPositiveButton(R.string.MediaCaptureFragment_device_link_dialog_continue) { d, _ ->
if (FeatureFlags.linkedDevicesV2()) {
if (FeatureFlags.internalUser()) {
startActivity(AppSettingsActivity.linkedDevices(requireContext()))
} else {
startActivity(DeviceActivity.getIntentForScanner(requireContext()))

8
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.kt
View file

@ -125,7 +125,6 @@ object FeatureFlags {
private const val RESTORE_POST_REGISTRATION = "android.registration.restorePostRegistration"
private const val LIBSIGNAL_WEB_SOCKET_SHADOW_PCT = "android.libsignalWebSocketShadowingPercentage"
private const val DELETE_SYNC_SEND_RECEIVE = "android.deleteSyncSendReceive"
private const val LINKED_DEVICES_V2 = "android.linkedDevices.v2"
private const val SVR3_MIGRATION_PHASE = "global.svr3.phase"
/**
@ -212,7 +211,7 @@ object FeatureFlags {
@JvmField
@VisibleForTesting
val NOT_REMOTE_CAPABLE: Set<String> = SetUtil.newHashSet(MESSAGE_BACKUPS, REGISTRATION_V2, RESTORE_POST_REGISTRATION, LINKED_DEVICES_V2)
val NOT_REMOTE_CAPABLE: Set<String> = SetUtil.newHashSet(MESSAGE_BACKUPS, REGISTRATION_V2, RESTORE_POST_REGISTRATION)
/**
* Values in this map will take precedence over any value. This should only be used for local
@ -810,11 +809,6 @@ object FeatureFlags {
return getBoolean(DELETE_SYNC_SEND_RECEIVE, false)
}
/** Whether or not to use V2 of linked devices. */
fun linkedDevicesV2(): Boolean {
return getBoolean(LINKED_DEVICES_V2, false)
}
/** Which phase we're in for the SVR3 migration */
fun svr3MigrationPhase(): Int {
return getInteger(SVR3_MIGRATION_PHASE, 0)