Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restrict edit description to V2 and remove feature flag.

Browse Source
This commit is contained in:
Cody Henthorne
2021-06-07 20:07:49 -04:00
committed by GitHub
parent 57c0b8fd0f
commit 6f6a6826d9
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
View File

@@ -444,7 +444,7 @@ public class ManageGroupFragment extends LoggingFragment {
}
private void updateGroupDescription(@NonNull ManageGroupViewModel.Description description) {
if (!TextUtils.isEmpty(description.getDescription()) || (FeatureFlags.groupsV2Description() && description.canEditDescription())) {
if (!TextUtils.isEmpty(description.getDescription()) || description.canEditDescription()) {
groupDescription.setVisibility(View.VISIBLE);
groupDescription.setMovementMethod(LongClickMovementMethod.getInstance(requireContext()));
memberCountUnderAvatar.setVisibility(View.GONE);
@@ -455,7 +455,7 @@ public class ManageGroupFragment extends LoggingFragment {
}
if (TextUtils.isEmpty(description.getDescription())) {
if (FeatureFlags.groupsV2Description() && description.canEditDescription()) {
if (description.canEditDescription()) {
groupDescription.setOverflowText(null);
groupDescription.setText(R.string.ManageGroupActivity_add_group_description);
groupDescription.setOnClickListener(v -> startActivity(EditProfileActivity.getIntentForGroupProfile(requireActivity(), getGroupId())));

2
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
View File

@@ -184,7 +184,7 @@ public class EditProfileFragment extends LoggingFragment {
toolbar.setTitle(R.string.EditProfileFragment__edit_group);
preview.setVisibility(View.GONE);
if (FeatureFlags.groupsV2Description()) {
if (groupId.isV2()) {
EditTextUtil.addGraphemeClusterLimitFilter(familyName, MAX_DESCRIPTION_GLYPHS);
familyName.addTextChangedListener(new AfterTextChanged(s -> {
EditProfileNameFragment.trimFieldToMaxByteLength(s, MAX_DESCRIPTION_BYTES);

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

@@ -80,7 +80,6 @@ public final class FeatureFlags {
private static final String NOTIFICATION_REWRITE = "android.notificationRewrite";
private static final String MP4_GIF_SEND_SUPPORT = "android.mp4GifSendSupport";
private static final String MEDIA_QUALITY_LEVELS = "android.mediaQuality.levels";
private static final String GROUPS_V2_DESCRIPTION_VERSION = "android.groupsv2.descriptionVersion";
private static final String DEFAULT_MESSAGE_TIMER = "android.defaultMessageTimer.2";
private static final String RETRY_RECEIPT_LIFESPAN = "android.retryReceiptLifespan";
private static final String RETRY_RESPOND_MAX_AGE = "android.retryRespondMaxAge";
@@ -119,7 +118,6 @@ public final class FeatureFlags {
NOTIFICATION_REWRITE,
MP4_GIF_SEND_SUPPORT,
MEDIA_QUALITY_LEVELS,
GROUPS_V2_DESCRIPTION_VERSION,
DEFAULT_MESSAGE_TIMER,
RETRY_RECEIPT_LIFESPAN,
RETRY_RESPOND_MAX_AGE,
@@ -170,7 +168,6 @@ public final class FeatureFlags {
NOTIFICATION_REWRITE,
MP4_GIF_SEND_SUPPORT,
MEDIA_QUALITY_LEVELS,
GROUPS_V2_DESCRIPTION_VERSION,
DEFAULT_MESSAGE_TIMER,
RETRY_RECEIPT_LIFESPAN,
RETRY_RESPOND_MAX_AGE
@@ -373,10 +370,6 @@ public final class FeatureFlags {
return getString(MEDIA_QUALITY_LEVELS, "");
}
public static boolean groupsV2Description() {
return getVersionFlag(GROUPS_V2_DESCRIPTION_VERSION) == VersionFlag.ON;
}
public static boolean defaultMessageTimer() {
return getBoolean(DEFAULT_MESSAGE_TIMER, false);
}