Move more util classes to core-util.

2026-04-22 18:00:02 +01:00 · 2022-03-29 16:48:39 -04:00
parent 390b7ff834
commit 77ea2deada
55 changed files with 147 additions and 141 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -49,7 +49,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.signal.core.util.CursorUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -37,7 +37,7 @@ import org.thoughtcrime.securesms.components.mention.MentionValidatorWatcher;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiUtil.java
@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.ObsoleteEmoji;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.Util;

 import java.util.HashSet;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
@@ -13,13 +13,13 @@ import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.animation.doOnEnd
 import androidx.core.text.isDigitsOnly
 import com.google.android.material.button.MaterialButton
+import org.signal.core.util.StringUtil
 import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
-import org.thoughtcrime.securesms.util.StringUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt
@@ -12,6 +12,7 @@ import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.subjects.PublishSubject
+import org.signal.core.util.StringUtil
 import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
 import org.signal.donations.GooglePayApi
@@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
 import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
-import org.thoughtcrime.securesms.util.StringUtil
 import org.thoughtcrime.securesms.util.livedata.Store
 import java.math.BigDecimal
 import java.text.DecimalFormat
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantListUpdate.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantListUpdate.java
@@ -8,7 +8,7 @@ import com.annimon.stream.Stream;

 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.CallParticipantId;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;

 import java.util.List;
 import java.util.Objects;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
@@ -46,7 +46,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.ringrtc.CameraState;
 import org.thoughtcrime.securesms.util.BlurTransformation;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.ThrottledDebouncer;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
@@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter.ViewHolde
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.CharacterIterable;
+import org.signal.core.util.CharacterIterable;
 import org.signal.core.util.CursorUtil;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration.StickyHeaderAdapter;
 import org.thoughtcrime.securesms.util.Util;
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;

 import java.io.IOException;
 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryHsmV1.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryHsmV1.java
@@ -7,7 +7,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper.DirectoryResult;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.push.ACI;

--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV2.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV2.java
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper.DirectoryResult;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.push.IasTrustStore;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.TrustStore;
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
@@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.sms.IncomingJoinedMessage;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.ProfileUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -128,7 +128,7 @@ import org.thoughtcrime.securesms.util.PlaceholderURLSpan;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ProjectionList;
 import org.thoughtcrime.securesms.util.SearchUtil;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.UrlClickHandler;
 import org.thoughtcrime.securesms.util.Util;
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration.kt
@@ -21,9 +21,9 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.lottie.SimpleColorFilter
+import org.signal.core.util.SetUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.conversation.ConversationAdapter
-import org.thoughtcrime.securesms.util.SetUtil
 import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
@@ -59,7 +59,7 @@ import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.FileUtils;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.StorageUtil;
 import org.thoughtcrime.securesms.video.EncryptedMediaDataSource;
 import org.whispersystems.signalservice.internal.util.JsonUtil;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
@@ -13,6 +13,7 @@ import androidx.annotation.WorkerThread;
 import com.annimon.stream.Stream;
 import com.google.protobuf.InvalidProtocolBufferException;

+import org.signal.core.util.SetUtil;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
@@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.signal.core.util.CursorUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
 import org.signal.core.util.SqlUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
@@ -86,7 +86,6 @@ import org.thoughtcrime.securesms.util.Base64
 import org.thoughtcrime.securesms.util.GroupUtil
 import org.thoughtcrime.securesms.util.IdentityUtil
 import org.thoughtcrime.securesms.util.ProfileUtil
-import org.thoughtcrime.securesms.util.StringUtil
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaperFactory
@@ -2160,7 +2159,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
  }

  fun querySignalContacts(inputQuery: String, includeSelf: Boolean): Cursor? {
-    val query = buildCaseInsensitiveGlobPattern(inputQuery)
+    val query = SqlUtil.buildCaseInsensitiveGlobPattern(inputQuery)

    val searchSelection = ContactSearchSelection.Builder()
      .withRegistered(true)
@@ -2186,7 +2185,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
  }

  fun queryNonSignalContacts(inputQuery: String): Cursor? {
-    val query = buildCaseInsensitiveGlobPattern(inputQuery)
+    val query = SqlUtil.buildCaseInsensitiveGlobPattern(inputQuery)
    val searchSelection = ContactSearchSelection.Builder()
      .withNonRegistered(true)
      .withGroups(false)
@@ -2210,7 +2209,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
  }

  fun queryNonGroupContacts(inputQuery: String, includeSelf: Boolean): Cursor? {
-    val query = buildCaseInsensitiveGlobPattern(inputQuery)
+    val query = SqlUtil.buildCaseInsensitiveGlobPattern(inputQuery)

    val searchSelection = ContactSearchSelection.Builder()
      .withRegistered(true)
@@ -2227,7 +2226,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
  }

  fun queryAllContacts(inputQuery: String): Cursor? {
-    val query = buildCaseInsensitiveGlobPattern(inputQuery)
+    val query = SqlUtil.buildCaseInsensitiveGlobPattern(inputQuery)
    val selection =
      """
        $BLOCKED = ? AND 
@@ -2244,7 +2243,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :

  @JvmOverloads
  fun queryRecipientsForMentions(inputQuery: String, recipientIds: List<RecipientId>? = null): List<Recipient> {
-    val query = buildCaseInsensitiveGlobPattern(inputQuery)
+    val query = SqlUtil.buildCaseInsensitiveGlobPattern(inputQuery)
    var ids: String? = null

    if (Util.hasItems(recipientIds)) {
@@ -3012,75 +3011,6 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
    }.orElse(null)
  }

-  /**
-   * Builds a case-insensitive GLOB pattern for fuzzy text queries. Works with all unicode
-   * characters.
-   *
-   * Ex:
-   * cat -> [cC][aA][tT]
-   */
-  private fun buildCaseInsensitiveGlobPattern(query: String): String {
-    if (TextUtils.isEmpty(query)) {
-      return "*"
-    }
-
-    val pattern = StringBuilder()
-    var i = 0
-    val len = query.codePointCount(0, query.length)
-    while (i < len) {
-      val point = StringUtil.codePointToString(query.codePointAt(i))
-      pattern.append("[")
-      pattern.append(point.toLowerCase())
-      pattern.append(point.toUpperCase())
-      pattern.append(getAccentuatedCharRegex(point.toLowerCase()))
-      pattern.append("]")
-      i++
-    }
-
-    return "*$pattern*"
-  }
-
-  private fun getAccentuatedCharRegex(query: String): String {
-    return when (query) {
-      "a" -> "À-Åà-åĀ-ąǍǎǞ-ǡǺ-ǻȀ-ȃȦȧȺɐ-ɒḀḁẚẠ-ặ"
-      "b" -> "ßƀ-ƅɃɓḂ-ḇ"
-      "c" -> "çÇĆ-čƆ-ƈȻȼɔḈḉ"
-      "d" -> "ÐðĎ-đƉ-ƍȡɖɗḊ-ḓ"
-      "e" -> "È-Ëè-ëĒ-ěƎ-ƐǝȄ-ȇȨȩɆɇɘ-ɞḔ-ḝẸ-ệ"
-      "f" -> "ƑƒḞḟ"
-      "g" -> "Ĝ-ģƓǤ-ǧǴǵḠḡ"
-      "h" -> "Ĥ-ħƕǶȞȟḢ-ḫẖ"
-      "i" -> "Ì-Ïì-ïĨ-ıƖƗǏǐȈ-ȋɨɪḬ-ḯỈ-ị"
-      "j" -> "ĴĵǰȷɈɉɟ"
-      "k" -> "Ķ-ĸƘƙǨǩḰ-ḵ"
-      "l" -> "Ĺ-łƚȴȽɫ-ɭḶ-ḽ"
-      "m" -> "Ɯɯ-ɱḾ-ṃ"
-      "n" -> "ÑñŃ-ŋƝƞǸǹȠȵɲ-ɴṄ-ṋ"
-      "o" -> "Ò-ÖØò-öøŌ-őƟ-ơǑǒǪ-ǭǾǿȌ-ȏȪ-ȱṌ-ṓỌ-ợ"
-      "p" -> "ƤƥṔ-ṗ"
-      "q" -> ""
-      "r" -> "Ŕ-řƦȐ-ȓɌɍṘ-ṟ"
-      "s" -> "Ś-šƧƨȘșȿṠ-ṩ"
-      "t" -> "Ţ-ŧƫ-ƮȚțȾṪ-ṱẗ"
-      "u" -> "Ù-Üù-üŨ-ųƯ-ƱǓ-ǜȔ-ȗɄṲ-ṻỤ-ự"
-      "v" -> "ƲɅṼ-ṿ"
-      "w" -> "ŴŵẀ-ẉẘ"
-      "x" -> "Ẋ-ẍ"
-      "y" -> "ÝýÿŶ-ŸƔƳƴȲȳɎɏẎẏỲ-ỹỾỿẙ"
-      "z" -> "Ź-žƵƶɀẐ-ẕ"
-      "α" -> "\u0386\u0391\u03AC\u03B1\u1F00-\u1F0F\u1F70\u1F71\u1F80-\u1F8F\u1FB0-\u1FB4\u1FB6-\u1FBC"
-      "ε" -> "\u0388\u0395\u03AD\u03B5\u1F10-\u1F15\u1F18-\u1F1D\u1F72\u1F73\u1FC8\u1FC9"
-      "η" -> "\u0389\u0397\u03AE\u03B7\u1F20-\u1F2F\u1F74\u1F75\u1F90-\u1F9F\u1F20-\u1F2F\u1F74\u1F75\u1F90-\u1F9F\u1fc2\u1fc3\u1fc4\u1fc6\u1FC7\u1FCA\u1FCB\u1FCC"
-      "ι" -> "\u038A\u0390\u0399\u03AA\u03AF\u03B9\u03CA\u1F30-\u1F3F\u1F76\u1F77\u1FD0-\u1FD3\u1FD6-\u1FDB"
-      "ο" -> "\u038C\u039F\u03BF\u03CC\u1F40-\u1F45\u1F48-\u1F4D\u1F78\u1F79\u1FF8\u1FF9"
-      "σ" -> "\u03A3\u03C2\u03C3"
-      "ς" -> "\u03A3\u03C2\u03C3"
-      "υ" -> "\u038E\u03A5\u03AB\u03C5\u03CB\u03CD\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F\u1F7A\u1F7B\u1FE0-\u1FE3\u1FE6-\u1FEB"
-      "ω" -> "\u038F\u03A9\u03C9\u03CE\u1F60-\u1F6F\u1F7C\u1F7D\u1FA0-\u1FAF\u1FF2-\u1FF4\u1FF6\u1FF7\u1FFA-\u1FFC"
-      else -> ""
-    }
-  }
-
  private fun updateProfileValuesForMerge(values: ContentValues, record: RecipientRecord) {
    values.apply {
      put(PROFILE_KEY, if (record.profileKey != null) Base64.encodeBytes(record.profileKey) else null)
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
@@ -3,10 +3,8 @@ package org.thoughtcrime.securesms.database.model;
 import android.content.Context;

 import androidx.annotation.DrawableRes;
-import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;

 import com.google.protobuf.ByteString;

@@ -24,7 +22,7 @@ import org.signal.storageservice.protos.groups.local.EnabledState;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.groups.GV2AccessLevelUtil;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -58,7 +58,7 @@ import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.push.ServiceId;
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -45,7 +45,7 @@ import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.RecipientAccessList;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteDeleteSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteDeleteSendJob.java
@@ -11,7 +11,6 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.MessageDatabase;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.database.model.DistributionListId;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.groups.GroupId;
@@ -22,10 +21,9 @@ import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.stories.Stories;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.util.GroupUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
@@ -34,10 +32,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException;

 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;

 public class RemoteDeleteSendJob extends BaseJob {

--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.ProfileUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
--- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
@@ -17,7 +17,7 @@ import com.annimon.stream.Stream;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.stickers.StickerUrl;
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.util.OptionalUtil;

--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
@@ -31,7 +31,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.LocaleFeatureFlags;
 import org.thoughtcrime.securesms.util.PlayServicesUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaperActivity;
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageProcessor.java
@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.messages.MessageDecryptionUtil.DecryptionResul
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.GroupUtil;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.SignalSessionLock;
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/UserNotificationMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/UserNotificationMigrationJob.java
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.notifications.NotificationIds;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.payments.Payee;
 import org.thoughtcrime.securesms.payments.preferences.RecipientHasNotEnabledPaymentsDialog;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 import org.whispersystems.signalservice.api.payments.FormatterOptions;
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java
@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.payments.currency.CurrencyExchange;
 import org.thoughtcrime.securesms.payments.currency.CurrencyExchangeRepository;
 import org.thoughtcrime.securesms.payments.currency.CurrencyUtil;
 import org.thoughtcrime.securesms.util.AsynchronousCallback;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;
 import org.thoughtcrime.securesms.util.livedata.Store;

--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyViewModel.java
@@ -11,7 +11,7 @@ import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;

 import org.thoughtcrime.securesms.util.AsynchronousCallback;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;

 final class PaymentsAddMoneyViewModel extends ViewModel {

--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/details/PaymentDetailsFragment.java
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.payments.State;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.SpanUtil;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.views.LearnMoreTextView;
 import org.whispersystems.signalservice.api.payments.Money;

--- a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
@@ -15,8 +15,8 @@ import org.signal.libsignal.protocol.util.Pair;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.util.SetUtil;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.SetUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.Util;

 import java.util.Optional;
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.preferences.widgets.StoragePreferenceCategory;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;

 import java.text.NumberFormat;
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/ProfileName.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/ProfileName.java
@@ -9,7 +9,7 @@ import androidx.annotation.VisibleForTesting;

 import com.annimon.stream.Stream;

-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.cjkv.CJKVUtil;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;

--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.profiles.edit.EditProfileRepository.UploadResult;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;

 import java.util.Arrays;
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiUtil;
 import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.AlwaysChangedDiffUtil;
 import org.thoughtcrime.securesms.util.text.AfterTextChanged;
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java
@@ -22,7 +22,7 @@ import org.signal.core.util.EditTextUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.text.AfterTextChanged;

--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameViewModel.java
@@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModel;

 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;

 public final class EditProfileNameViewModel extends ViewModel {

--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.util.AvatarUtil;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.StringUtil;
+import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper;
 import org.whispersystems.signalservice.api.push.PNI;
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.payments.Entropy;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.subscription.Subscriber;
 import org.thoughtcrime.securesms.util.Base64;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncValidations.java
@@ -8,7 +8,7 @@ import com.annimon.stream.Stream;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Base64;
-import org.thoughtcrime.securesms.util.SetUtil;
+import org.signal.core.util.SetUtil;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CharacterIterable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CharacterIterable.java
@@ -1,124 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.os.Build;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
-import java.util.Iterator;
-
-/**
- * Iterates over a string treating a surrogate pair and a grapheme cluster a single character.
- */
-public final class CharacterIterable implements Iterable<String> {
-
-  private final String string;
-
-  public CharacterIterable(@NonNull String string) {
-    this.string = string;
-  }
-
-  @Override
-  public @NonNull Iterator<String> iterator() {
-    return new CharacterIterator();
-  }
-
-  private class CharacterIterator implements Iterator<String> {
-    private static final int UNINITIALIZED = -2;
-
-    private final BreakIteratorCompat breakIterator;
-
-    private int lastIndex = UNINITIALIZED;
-
-    CharacterIterator() {
-      this.breakIterator = Build.VERSION.SDK_INT >= 24 ? new AndroidIcuBreakIterator(string)
-                                                       : new FallbackBreakIterator(string);
-    }
-
-    @Override
-    public boolean hasNext() {
-      if (lastIndex == UNINITIALIZED) {
-        lastIndex = breakIterator.first();
-      }
-      return !breakIterator.isDone(lastIndex);
-    }
-
-    @Override
-    public String next() {
-      int firstIndex = lastIndex;
-      lastIndex = breakIterator.next();
-      return string.substring(firstIndex, lastIndex);
-    }
-  }
-
-  private interface BreakIteratorCompat {
-    int first();
-
-    int next();
-
-    boolean isDone(int index);
-  }
-
-  /**
-   * An BreakIteratorCompat implementation that delegates calls to `android.icu.text.BreakIterator`.
-   * This class handles grapheme clusters fine but requires Android API >= 24.
-   */
-  @RequiresApi(24)
-  private static class AndroidIcuBreakIterator implements BreakIteratorCompat {
-    private final android.icu.text.BreakIterator breakIterator = android.icu.text.BreakIterator.getCharacterInstance();
-
-    public AndroidIcuBreakIterator(@NonNull String string) {
-      breakIterator.setText(string);
-    }
-
-    @Override
-    public int first() {
-      return breakIterator.first();
-    }
-
-    @Override
-    public int next() {
-      return breakIterator.next();
-    }
-
-    @Override
-    public boolean isDone(int index) {
-      return index == android.icu.text.BreakIterator.DONE;
-    }
-  }
-
-  /**
-   * An BreakIteratorCompat implementation that delegates calls to `java.text.BreakIterator`.
-   * This class may or may not handle grapheme clusters well depending on the underlying implementation.
-   * In the emulator, API 23 implements ICU version of the BreakIterator so that it handles grapheme
-   * clusters fine. But API 21 implements RuleBasedIterator which does not handle grapheme clusters.
-   * <p>
-   * If it doesn't handle grapheme clusters correctly, in most cases the combined characters are
-   * broken up into pieces when the code tries to trim a string. For example, an emoji that is
-   * a combination of a person, gender and skin tone, trimming the character using this class may result
-   * in trimming the parts of the character, e.g. a dark skin frowning woman emoji may result in
-   * a neutral skin frowning woman emoji.
-   */
-  private static class FallbackBreakIterator implements BreakIteratorCompat {
-    private final java.text.BreakIterator breakIterator = java.text.BreakIterator.getCharacterInstance();
-
-    public FallbackBreakIterator(@NonNull String string) {
-      breakIterator.setText(string);
-    }
-
-    @Override
-    public int first() {
-      return breakIterator.first();
-    }
-
-    @Override
-    public int next() {
-      return breakIterator.next();
-    }
-
-    @Override
-    public boolean isDone(int index) {
-      return index == java.text.BreakIterator.DONE;
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DiffHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DiffHelper.java
@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.util;

 import androidx.annotation.NonNull;

+import org.signal.core.util.SetUtil;
+
 import java.util.Collection;
 import java.util.Set;

--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -10,6 +10,7 @@ import com.annimon.stream.Stream;

 import org.json.JSONException;
 import org.json.JSONObject;
+import org.signal.core.util.SetUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
--- a/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
@@ -8,6 +8,7 @@ import androidx.annotation.WorkerThread;

 import com.google.protobuf.ByteString;

+import org.signal.core.util.StringUtil;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.zkgroup.InvalidInputException;
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SetUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SetUtil.java
@@ -1,37 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.annotation.SuppressLint;
-
-import com.google.android.collect.Sets;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-public final class SetUtil {
-  private SetUtil() {}
-
-  public static <E> Set<E> intersection(Collection<E> a, Collection<E> b) {
-    Set<E> intersection = new LinkedHashSet<>(a);
-    intersection.retainAll(b);
-    return intersection;
-  }
-
-  public static <E> Set<E> difference(Collection<E> a, Collection<E> b) {
-    Set<E> difference = new LinkedHashSet<>(a);
-    difference.removeAll(b);
-    return difference;
-  }
-
-  public static <E> Set<E> union(Set<E> a, Set<E> b) {
-    Set<E> result = new LinkedHashSet<>(a);
-    result.addAll(b);
-    return result;
-  }
-
-  @SuppressLint("NewApi")
-  public static <E> HashSet<E> newHashSet(E... elements) {
-    return Sets.newHashSet(elements);
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
@@ -1,320 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.text.BidiFormatter;
-
-import org.signal.core.util.BreakIteratorCompat;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-public final class StringUtil {
-
-  private static final Set<Character> WHITESPACE = SetUtil.newHashSet('\u200E',  // left-to-right mark
-                                                                      '\u200F',  // right-to-left mark
-                                                                      '\u2007',  // figure space
-                                                                      '\u200B',  // zero-width space
-                                                                      '\u2800'); // braille blank
-
-
-  private static final Pattern ALL_ASCII_PATTERN = Pattern.compile("^[\\x00-\\x7F]*$");
-
-  private static final class Bidi {
-    /** Override text direction  */
-    private static final Set<Integer> OVERRIDES = SetUtil.newHashSet("\u202a".codePointAt(0), /* LRE */
-                                                                     "\u202b".codePointAt(0), /* RLE */
-                                                                     "\u202d".codePointAt(0), /* LRO */
-                                                                     "\u202e".codePointAt(0)  /* RLO */);
-
-    /** Set direction and isolate surrounding text */
-    private static final Set<Integer> ISOLATES = SetUtil.newHashSet("\u2066".codePointAt(0), /* LRI */
-                                                                    "\u2067".codePointAt(0), /* RLI */
-                                                                    "\u2068".codePointAt(0)  /* FSI */);
-    /** Closes things in {@link #OVERRIDES} */
-    private static final int PDF = "\u202c".codePointAt(0);
-
-    /** Closes things in {@link #ISOLATES} */
-    private static final int PDI = "\u2069".codePointAt(0);
-
-    /** Auto-detecting isolate */
-    private static final int FSI = "\u2068".codePointAt(0);
-  }
-
-  private StringUtil() {
-  }
-
-  /**
-   * Trims a name string to fit into the byte length requirement.
-   * <p>
-   * This method treats a surrogate pair and a grapheme cluster a single character
-   * See examples in tests defined in StringUtilText_trimToFit.
-   */
-  public static @NonNull String trimToFit(@Nullable String name, int maxByteLength) {
-    if (TextUtils.isEmpty(name)) {
-      return "";
-    }
-
-    if (name.getBytes(StandardCharsets.UTF_8).length <= maxByteLength) {
-      return name;
-    }
-
-    try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
-      for (String graphemeCharacter : new CharacterIterable(name)) {
-        byte[] bytes = graphemeCharacter.getBytes(StandardCharsets.UTF_8);
-
-        if (stream.size() + bytes.length <= maxByteLength) {
-          stream.write(bytes);
-        } else {
-          break;
-        }
-      }
-      return stream.toString();
-    } catch (IOException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  /**
-   * @return A charsequence with no leading or trailing whitespace. Only creates a new charsequence
-   *         if it has to.
-   */
-  public static @NonNull CharSequence trim(@NonNull CharSequence charSequence) {
-    if (charSequence.length() == 0) {
-      return charSequence;
-    }
-
-    int start = 0;
-    int end   = charSequence.length() - 1;
-
-    while (start < charSequence.length() && Character.isWhitespace(charSequence.charAt(start))) {
-      start++;
-    }
-
-    while (end >= 0 && end > start && Character.isWhitespace(charSequence.charAt(end))) {
-      end--;
-    }
-
-    if (start > 0 || end < charSequence.length() - 1) {
-      return charSequence.subSequence(start, end + 1);
-    } else {
-      return charSequence;
-    }
-  }
-
-  /**
-   * @return True if the string is empty, or if it contains nothing but whitespace characters.
-   *         Accounts for various unicode whitespace characters.
-   */
-  public static boolean isVisuallyEmpty(@Nullable String value) {
-    if (value == null || value.length() == 0) {
-      return true;
-    }
-
-    return indexOfFirstNonEmptyChar(value) == -1;
-  }
-
-  /**
-   * @return String without any leading or trailing whitespace.
-   *         Accounts for various unicode whitespace characters.
-   */
-  public static String trimToVisualBounds(@NonNull String value) {
-    int start = indexOfFirstNonEmptyChar(value);
-
-    if (start == -1) {
-      return "";
-    }
-
-    int end = indexOfLastNonEmptyChar(value);
-
-    return value.substring(start, end + 1);
-  }
-
-  private static int indexOfFirstNonEmptyChar(@NonNull String value) {
-    int length = value.length();
-
-    for (int i = 0; i < length; i++) {
-      if (!isVisuallyEmpty(value.charAt(i))) {
-        return i;
-      }
-    }
-
-    return -1;
-  }
-
-  private static int indexOfLastNonEmptyChar(@NonNull String value) {
-    for (int i = value.length() - 1; i >= 0; i--) {
-      if (!isVisuallyEmpty(value.charAt(i))) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  /**
-   * @return True if the character is invisible or whitespace. Accounts for various unicode
-   *         whitespace characters.
-   */
-  public static boolean isVisuallyEmpty(char c) {
-    return Character.isWhitespace(c) || WHITESPACE.contains(c);
-  }
-
-  /**
-   * @return A string representation of the provided unicode code point.
-   */
-  public static @NonNull String codePointToString(int codePoint) {
-    return new String(Character.toChars(codePoint));
-  }
-
-  /**
-   * @return True if the provided text contains a mix of LTR and RTL characters, otherwise false.
-   */
-  public static boolean hasMixedTextDirection(@Nullable CharSequence text) {
-    if (text == null) {
-      return false;
-    }
-
-    Boolean isLtr = null;
-
-    for (int i = 0, len = Character.codePointCount(text, 0, text.length()); i < len; i++) {
-      int     codePoint = Character.codePointAt(text, i);
-      byte    direction = Character.getDirectionality(codePoint);
-      boolean isLetter  = Character.isLetter(codePoint);
-
-      if (isLtr != null && isLtr && direction != Character.DIRECTIONALITY_LEFT_TO_RIGHT && isLetter) {
-        return true;
-      } else if (isLtr != null && !isLtr && direction != Character.DIRECTIONALITY_RIGHT_TO_LEFT && isLetter) {
-        return true;
-      } else if (isLetter) {
-        isLtr = direction == Character.DIRECTIONALITY_LEFT_TO_RIGHT;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Isolates bi-directional text from influencing surrounding text. You should use this whenever
-   * you're injecting user-generated text into a larger string.
-   *
-   * You'd think we'd be able to trust {@link BidiFormatter}, but unfortunately it just misses some
-   * corner cases, so here we are.
-   *
-   * The general idea is just to balance out the opening and closing codepoints, and then wrap the
-   * whole thing in FSI/PDI to isolate it.
-   *
-   * For more details, see:
-   * https://www.w3.org/International/questions/qa-bidi-unicode-controls
-   */
-  public static @NonNull String isolateBidi(@Nullable String text) {
-    if (text == null) {
-      return "";
-    }
-
-    if (Util.isEmpty(text)) {
-      return text;
-    }
-
-    if (ALL_ASCII_PATTERN.matcher(text).matches()) {
-      return text;
-    }
-
-    int overrideCount      = 0;
-    int overrideCloseCount = 0;
-    int isolateCount       = 0;
-    int isolateCloseCount  = 0;
-
-    for (int i = 0, len = text.codePointCount(0, text.length()); i < len; i++) {
-      int codePoint = text.codePointAt(i);
-
-      if (Bidi.OVERRIDES.contains(codePoint)) {
-        overrideCount++;
-      } else if (codePoint == Bidi.PDF) {
-        overrideCloseCount++;
-      } else if (Bidi.ISOLATES.contains(codePoint)) {
-        isolateCount++;
-      } else if (codePoint == Bidi.PDI) {
-        isolateCloseCount++;
-      }
-    }
-
-    StringBuilder suffix = new StringBuilder();
-
-    while (overrideCount > overrideCloseCount) {
-      suffix.appendCodePoint(Bidi.PDF);
-      overrideCloseCount++;
-    }
-
-    while (isolateCount > isolateCloseCount) {
-      suffix.appendCodePoint(Bidi.FSI);
-      isolateCloseCount++;
-    }
-
-    StringBuilder out = new StringBuilder();
-
-    return out.appendCodePoint(Bidi.FSI)
-              .append(text)
-              .append(suffix)
-              .appendCodePoint(Bidi.PDI)
-              .toString();
-  }
-
-  public static @Nullable String stripBidiProtection(@Nullable String text) {
-    if (text == null) return null;
-
-    return text.replaceAll("[\\u2068\\u2069\\u202c]", "");
-  }
-
-  public static @NonNull String stripBidiIndicator(@NonNull String text) {
-    return text.replace("\u200F", "");
-  }
-
-  /**
-   * Trims a {@link CharSequence} of starting and trailing whitespace. Behavior matches
-   * {@link String#trim()} to preserve expectations around results.
-   */
-  public static CharSequence trimSequence(CharSequence text) {
-    int length     = text.length();
-    int startIndex = 0;
-
-    while ((startIndex < length) && (text.charAt(startIndex) <= ' ')) {
-      startIndex++;
-    }
-    while ((startIndex < length) && (text.charAt(length - 1) <= ' ')) {
-      length--;
-    }
-    return (startIndex > 0 || length < text.length()) ? text.subSequence(startIndex, length) : text;
-  }
-
-  /**
-   * If the {@param text} exceeds the {@param maxChars} it is trimmed in the middle so that the result is exactly {@param maxChars} long including an added
-   * ellipsis character.
-   * <p>
-   * Otherwise the string is returned untouched.
-   * <p>
-   * When {@param maxChars} is even, one more character is kept from the end of the string than the start.
-   */
-  public static @Nullable CharSequence abbreviateInMiddle(@Nullable CharSequence text, int maxChars) {
-     if (text == null || text.length() <= maxChars) {
-      return text;
-    }
-
-    int start = (maxChars - 1) / 2;
-    int end   = (maxChars - 1) - start;
-    return text.subSequence(0, start) + "…" + text.subSequence(text.length() - end, text.length());
-  }
-
-  /**
-   * @return The number of graphemes in the provided string.
-   */
-  public static int getGraphemeCount(@NonNull CharSequence text) {
-    BreakIteratorCompat iterator = BreakIteratorCompat.getInstance();
-    iterator.setText(text);
-    return iterator.countBreaks();
-  }
-}