From d0162d0b21a307a3122cd720e075fccabb29e0ef Mon Sep 17 00:00:00 2001 From: mtang-signal Date: Mon, 7 Oct 2024 13:38:32 -0700 Subject: [PATCH] Update emojis in about status. --- .../groups/ui/GroupMemberListAdapter.java | 2 +- .../profiles/manage/EditAboutFragment.java | 18 ------------------ .../securesms/recipients/Recipient.kt | 5 +---- .../recipients/ui/about/AboutSheet.kt | 2 +- .../main/res/layout/edit_about_fragment.xml | 11 ----------- app/src/main/res/values/strings.xml | 2 -- .../java/org/signal/core/util/StringUtil.java | 2 -- 7 files changed, 3 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java index 6373ca1855..fc7a0e3328 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java @@ -438,7 +438,7 @@ final class GroupMemberListAdapter extends RecyclerView.Adapter { - checkValidText(editable.toString()); trimFieldToMaxByteLength(editable); presentCount(editable.toString()); })); @@ -131,21 +128,6 @@ public class EditAboutFragment extends Fragment implements EditProfileActivity.E ViewUtil.focusAndMoveCursorToEndAndOpenKeyboard(bodyView); } - private void checkValidText(String text) { - boolean isInvalid = false; - for (Character emoji : StringUtil.FILTERED_EMOJIS) { - if (text.contains(Character.toString(emoji))) { - isInvalid = true; - break; - } - } - - int colorRes = isInvalid ? R.color.signal_colorError : R.color.signal_colorPrimary; - bodyView.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), colorRes))); - errorView.setVisibility(isInvalid ? View.VISIBLE : View.GONE); - saveButton.setEnabled(!isInvalid); - } - @Override public void onSaveInstanceState(@NonNull Bundle outState) { outState.putString(KEY_SELECTED_EMOJI, selectedEmoji); diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt index d7965a6214..b6bc37f98d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt @@ -367,11 +367,8 @@ class Recipient( /** The badge to feature on a recipient's avatar, if any. */ val featuredBadge: Badge? = badges.firstOrNull() - /** A string filtering out banned emojis from the about text */ - val filteredAbout: String? by lazy { about?.filterNot { StringUtil.FILTERED_EMOJIS.contains(it) } } - /** A string combining the about emoji + text for displaying various places. */ - val combinedAboutAndEmoji: String? by lazy { listOf(aboutEmoji, filteredAbout).filter { it.isNotNullOrBlank() }.joinToString(separator = " ").nullIfBlank() } + val combinedAboutAndEmoji: String? by lazy { listOf(aboutEmoji, about).filter { it.isNotNullOrBlank() }.joinToString(separator = " ").nullIfBlank() } /** Whether or not we should blur the recipient's avatar when showing it in the chat list and other locations. */ val shouldBlurAvatar: Boolean diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt index 9aaf2863a0..3e41e53287 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt @@ -96,7 +96,7 @@ class AboutSheet : ComposeBottomSheetDialogFragment() { displayName = recipient.get().getDisplayName(requireContext()), shortName = recipient.get().getShortDisplayName(requireContext()), profileName = recipient.get().profileName.toString(), - about = recipient.get().filteredAbout, + about = recipient.get().about, verified = verified, hasAvatar = recipient.get().profileAvatarFileDetails.hasFile(), recipientForAvatar = recipient.get(), diff --git a/app/src/main/res/layout/edit_about_fragment.xml b/app/src/main/res/layout/edit_about_fragment.xml index 5f3643a345..5bb293652f 100644 --- a/app/src/main/res/layout/edit_about_fragment.xml +++ b/app/src/main/res/layout/edit_about_fragment.xml @@ -59,17 +59,6 @@ app:layout_constraintTop_toTopOf="@id/edit_about_body" app:layout_constraintBottom_toBottomOf="@id/edit_about_body"/> - - Free to chat Taking a break Working on something new - - One or more characters is invalid. Edit group diff --git a/core-util/src/main/java/org/signal/core/util/StringUtil.java b/core-util/src/main/java/org/signal/core/util/StringUtil.java index f1719c4dc4..4afca60c0a 100644 --- a/core-util/src/main/java/org/signal/core/util/StringUtil.java +++ b/core-util/src/main/java/org/signal/core/util/StringUtil.java @@ -22,8 +22,6 @@ public final class StringUtil { '\u200B', // zero-width space '\u2800'); // braille blank - public static final List FILTERED_EMOJIS = List.of('\u2713', '\u2714', '\u2611', '\u221A', '\u26C9', '\u26CA', '\u26DB'); - private static final Pattern ALL_ASCII_PATTERN = Pattern.compile("^[\\x00-\\x7F]*$"); private static final class Bidi {