Fix false group name and avatar updates.

signalapp · Sep 25, 2020 · dc9370c · dc9370c
1 parent 8dbc721
commit dc9370c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java
@@ -16,6 +16,7 @@
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import java.util.Arrays;
 import java.util.Objects;
 
 class EditProfileViewModel extends ViewModel {
@@ -121,9 +122,9 @@ public void submitProfile(Consumer<EditProfileRepository.UploadResult> uploadRes
 
     repository.uploadProfile(profileName,
                              displayName,
-                             !Objects.equals(oldDisplayName, displayName),
+                             !Objects.equals(StringUtil.stripBidiProtection(oldDisplayName), displayName),
                              newAvatar,
-                             oldAvatar != newAvatar,
+                             !Arrays.equals(oldAvatar, newAvatar),
                              uploadResultConsumer);
   }
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
@@ -181,6 +181,12 @@ public static boolean isVisuallyEmpty(char c) {
               .toString();
   }
 
+  public static @Nullable String stripBidiProtection(@Nullable String text) {
+    if (text == null) return null;
+
+    return text.replaceAll("[\\u2068\\u2069\\u202c]", "");
+  }
+
   /**
    * Trims a {@link CharSequence} of starting and trailing whitespace. Behavior matches
    * {@link String#trim()} to preserve expectations around results.