kopia lustrzana https://github.com/ryukoposting/Signal-Android
Restrict edit description to V2 and remove feature flag.
rodzic
57c0b8fd0f
commit
6f6a6826d9
|
@ -444,7 +444,7 @@ public class ManageGroupFragment extends LoggingFragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateGroupDescription(@NonNull ManageGroupViewModel.Description description) {
|
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.setVisibility(View.VISIBLE);
|
||||||
groupDescription.setMovementMethod(LongClickMovementMethod.getInstance(requireContext()));
|
groupDescription.setMovementMethod(LongClickMovementMethod.getInstance(requireContext()));
|
||||||
memberCountUnderAvatar.setVisibility(View.GONE);
|
memberCountUnderAvatar.setVisibility(View.GONE);
|
||||||
|
@ -455,7 +455,7 @@ public class ManageGroupFragment extends LoggingFragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (TextUtils.isEmpty(description.getDescription())) {
|
if (TextUtils.isEmpty(description.getDescription())) {
|
||||||
if (FeatureFlags.groupsV2Description() && description.canEditDescription()) {
|
if (description.canEditDescription()) {
|
||||||
groupDescription.setOverflowText(null);
|
groupDescription.setOverflowText(null);
|
||||||
groupDescription.setText(R.string.ManageGroupActivity_add_group_description);
|
groupDescription.setText(R.string.ManageGroupActivity_add_group_description);
|
||||||
groupDescription.setOnClickListener(v -> startActivity(EditProfileActivity.getIntentForGroupProfile(requireActivity(), getGroupId())));
|
groupDescription.setOnClickListener(v -> startActivity(EditProfileActivity.getIntentForGroupProfile(requireActivity(), getGroupId())));
|
||||||
|
|
|
@ -184,7 +184,7 @@ public class EditProfileFragment extends LoggingFragment {
|
||||||
toolbar.setTitle(R.string.EditProfileFragment__edit_group);
|
toolbar.setTitle(R.string.EditProfileFragment__edit_group);
|
||||||
preview.setVisibility(View.GONE);
|
preview.setVisibility(View.GONE);
|
||||||
|
|
||||||
if (FeatureFlags.groupsV2Description()) {
|
if (groupId.isV2()) {
|
||||||
EditTextUtil.addGraphemeClusterLimitFilter(familyName, MAX_DESCRIPTION_GLYPHS);
|
EditTextUtil.addGraphemeClusterLimitFilter(familyName, MAX_DESCRIPTION_GLYPHS);
|
||||||
familyName.addTextChangedListener(new AfterTextChanged(s -> {
|
familyName.addTextChangedListener(new AfterTextChanged(s -> {
|
||||||
EditProfileNameFragment.trimFieldToMaxByteLength(s, MAX_DESCRIPTION_BYTES);
|
EditProfileNameFragment.trimFieldToMaxByteLength(s, MAX_DESCRIPTION_BYTES);
|
||||||
|
|
|
@ -80,7 +80,6 @@ public final class FeatureFlags {
|
||||||
private static final String NOTIFICATION_REWRITE = "android.notificationRewrite";
|
private static final String NOTIFICATION_REWRITE = "android.notificationRewrite";
|
||||||
private static final String MP4_GIF_SEND_SUPPORT = "android.mp4GifSendSupport";
|
private static final String MP4_GIF_SEND_SUPPORT = "android.mp4GifSendSupport";
|
||||||
private static final String MEDIA_QUALITY_LEVELS = "android.mediaQuality.levels";
|
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 DEFAULT_MESSAGE_TIMER = "android.defaultMessageTimer.2";
|
||||||
private static final String RETRY_RECEIPT_LIFESPAN = "android.retryReceiptLifespan";
|
private static final String RETRY_RECEIPT_LIFESPAN = "android.retryReceiptLifespan";
|
||||||
private static final String RETRY_RESPOND_MAX_AGE = "android.retryRespondMaxAge";
|
private static final String RETRY_RESPOND_MAX_AGE = "android.retryRespondMaxAge";
|
||||||
|
@ -119,7 +118,6 @@ public final class FeatureFlags {
|
||||||
NOTIFICATION_REWRITE,
|
NOTIFICATION_REWRITE,
|
||||||
MP4_GIF_SEND_SUPPORT,
|
MP4_GIF_SEND_SUPPORT,
|
||||||
MEDIA_QUALITY_LEVELS,
|
MEDIA_QUALITY_LEVELS,
|
||||||
GROUPS_V2_DESCRIPTION_VERSION,
|
|
||||||
DEFAULT_MESSAGE_TIMER,
|
DEFAULT_MESSAGE_TIMER,
|
||||||
RETRY_RECEIPT_LIFESPAN,
|
RETRY_RECEIPT_LIFESPAN,
|
||||||
RETRY_RESPOND_MAX_AGE,
|
RETRY_RESPOND_MAX_AGE,
|
||||||
|
@ -170,7 +168,6 @@ public final class FeatureFlags {
|
||||||
NOTIFICATION_REWRITE,
|
NOTIFICATION_REWRITE,
|
||||||
MP4_GIF_SEND_SUPPORT,
|
MP4_GIF_SEND_SUPPORT,
|
||||||
MEDIA_QUALITY_LEVELS,
|
MEDIA_QUALITY_LEVELS,
|
||||||
GROUPS_V2_DESCRIPTION_VERSION,
|
|
||||||
DEFAULT_MESSAGE_TIMER,
|
DEFAULT_MESSAGE_TIMER,
|
||||||
RETRY_RECEIPT_LIFESPAN,
|
RETRY_RECEIPT_LIFESPAN,
|
||||||
RETRY_RESPOND_MAX_AGE
|
RETRY_RESPOND_MAX_AGE
|
||||||
|
@ -373,10 +370,6 @@ public final class FeatureFlags {
|
||||||
return getString(MEDIA_QUALITY_LEVELS, "");
|
return getString(MEDIA_QUALITY_LEVELS, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean groupsV2Description() {
|
|
||||||
return getVersionFlag(GROUPS_V2_DESCRIPTION_VERSION) == VersionFlag.ON;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean defaultMessageTimer() {
|
public static boolean defaultMessageTimer() {
|
||||||
return getBoolean(DEFAULT_MESSAGE_TIMER, false);
|
return getBoolean(DEFAULT_MESSAGE_TIMER, false);
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue