Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline the nicknames feature flag.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-04-10 13:11:19 -04:00
parent fa23e4ca70
commit 831d099503
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
View File

@@ -94,7 +94,6 @@ import org.thoughtcrime.securesms.util.CommunicationActions
import org.thoughtcrime.securesms.util.ContextUtil
import org.thoughtcrime.securesms.util.DateUtils
import org.thoughtcrime.securesms.util.ExpirationUtil
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.Material3OnScrollHelper
import org.thoughtcrime.securesms.util.ViewUtil
import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -503,7 +502,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
)
}
if (FeatureFlags.nicknames() && state.recipient.isIndividual && !state.recipient.isSelf) {
if (state.recipient.isIndividual && !state.recipient.isSelf) {
clickPref(
title = DSLSettingsText.from(R.string.NicknameActivity__nickname),
icon = DSLSettingsIcon.from(R.drawable.symbol_edit_24),

16
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
View File

@@ -219,15 +219,13 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
AboutSheet.create(recipient).show(getParentFragmentManager(), null);
});
if (FeatureFlags.nicknames()) {
nickname.setVisibility(View.VISIBLE);
nickname.setOnClickListener(v -> {
nicknameLauncher.launch(new NicknameActivity.Args(
recipientId,
false
));
});
}
nickname.setVisibility(View.VISIBLE);
nickname.setOnClickListener(v -> {
nicknameLauncher.launch(new NicknameActivity.Args(
recipientId,
false
));
});
}
String aboutText = recipient.getCombinedAboutAndEmoji();

10
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@@ -127,7 +127,6 @@ public final class FeatureFlags {
private static final String RX_MESSAGE_SEND = "android.rxMessageSend";
private static final String LINKED_DEVICE_LIFESPAN_SECONDS = "android.linkedDeviceLifespanSeconds";
private static final String MESSAGE_BACKUPS = "android.messageBackups";
private static final String NICKNAMES = "android.nicknames";
private static final String CAMERAX_CUSTOM_CONTROLLER = "android.cameraXCustomController";
/**
@@ -208,7 +207,6 @@ public final class FeatureFlags {
CDSI_LIBSIGNAL_NET,
RX_MESSAGE_SEND,
LINKED_DEVICE_LIFESPAN_SECONDS,
NICKNAMES,
CAMERAX_CUSTOM_CONTROLLER
);
@@ -286,8 +284,7 @@ public final class FeatureFlags {
CDSI_LIBSIGNAL_NET,
RX_MESSAGE_SEND,
LINKED_DEVICE_LIFESPAN_SECONDS,
CAMERAX_CUSTOM_CONTROLLER,
NICKNAMES
CAMERAX_CUSTOM_CONTROLLER
);
/**
@@ -746,11 +743,6 @@ public final class FeatureFlags {
return getBoolean(MESSAGE_BACKUPS, false);
}
/** Whether or not the nicknames feature is available */
public static boolean nicknames() {
return getBoolean(NICKNAMES, true);
}
/** Whether or not to use the custom CameraX controller class */
public static boolean customCameraXController() {
return getBoolean(CAMERAX_CUSTOM_CONTROLLER, false);