Create a core-util module with some common utilities.

app/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java

@@ -3,9 +3,10 @@ package org.thoughtcrime.securesms.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.database.Cursor;
+
 import androidx.loader.content.AsyncTaskLoader;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 /**
  * A Loader similar to CursorLoader that doesn't require queries to go through the ContentResolver

app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java

@@ -9,11 +9,11 @@ import android.content.IntentFilter;
 import android.os.Build;
 import android.os.SystemClock;
 
-import java.util.concurrent.ConcurrentSkipListSet;
-
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 import org.whispersystems.signalservice.api.util.SleepTimer;
 
+import java.util.concurrent.ConcurrentSkipListSet;
+
 /**
  * A sleep timer that is based on elapsed realtime, so
  * that it works properly, even in low-power sleep modes.

app/src/main/java/org/thoughtcrime/securesms/util/AppSignatureUtil.java

@@ -5,11 +5,10 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.nio.charset.StandardCharsets;

app/src/main/java/org/thoughtcrime/securesms/util/AsyncLoader.java

@@ -16,9 +16,10 @@ package org.thoughtcrime.securesms.util;
  * limitations under the License.
  */
 
-import androidx.loader.content.AsyncTaskLoader;
 import android.content.Context;
 
+import androidx.loader.content.AsyncTaskLoader;
+
 /**
  * Loader which extends AsyncTaskLoaders and handles caveats
  * as pointed out in http://code.google.com/p/android/issues/detail?id=14944.

app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java

@@ -4,17 +4,18 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.text.TextUtils;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
-import android.text.TextUtils;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Collections;

app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java

@@ -20,13 +20,13 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.request.target.CustomViewTarget;
 import com.bumptech.glide.request.transition.Transition;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequest;
 import org.thoughtcrime.securesms.recipients.Recipient;

app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java

@@ -13,12 +13,12 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.documentfile.provider.DocumentFile;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.backup.BackupPassphrase;
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.whispersystems.libsignal.util.ByteUtil;
 

app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java

@@ -10,15 +10,16 @@ import android.graphics.Rect;
 import android.graphics.YuvImage;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.util.Pair;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 import androidx.exifinterface.media.ExifInterface;
-import android.util.Pair;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 

app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java

@@ -4,8 +4,6 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Build;
 import android.service.notification.StatusBarNotification;
 
@@ -16,18 +14,15 @@ import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 
-import org.thoughtcrime.securesms.conversation.BubbleConversationActivity;
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.notifications.DefaultMessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationIds;
 import org.thoughtcrime.securesms.notifications.SingleRecipientNotificationBuilder;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
-
-import java.util.Objects;
 
 import static org.thoughtcrime.securesms.util.ConversationUtil.CONVERSATION_SUPPORT_VERSION;
 

app/src/main/java/org/thoughtcrime/securesms/util/CachedInflater.java

@@ -12,9 +12,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.asynclayoutinflater.view.AsyncLayoutInflater;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 
 import java.util.Collections;
 import java.util.HashMap;

app/src/main/java/org/thoughtcrime/securesms/util/CharacterCalculator.java

@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.os.Parcel;
+
 import androidx.annotation.NonNull;
 
 public abstract class CharacterCalculator {

app/src/main/java/org/thoughtcrime/securesms/util/CloseableLiveData.java

@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.util;
 
 import androidx.lifecycle.MutableLiveData;
 
+import org.signal.core.util.StreamUtil;
+
 import java.io.Closeable;
 
 /**
@@ -19,7 +21,7 @@ public class CloseableLiveData<E extends Closeable> extends MutableLiveData<E> {
     E previous = getValue();
 
     if (previous != null && closePrevious) {
-      Util.close(previous);
+      StreamUtil.close(previous);
     }
 
     super.setValue(value);
@@ -29,7 +31,7 @@ public class CloseableLiveData<E extends Closeable> extends MutableLiveData<E> {
     E value = getValue();
 
     if (value != null) {
-      Util.close(value);
+      StreamUtil.close(value);
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java

@@ -20,9 +20,10 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.TaskStackBuilder;
 import androidx.fragment.app.FragmentActivity;
 
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.WebRtcCallActivity;
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
@@ -30,13 +31,11 @@ import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.ui.invitesandrequests.joining.GroupJoinBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.groups.ui.invitesandrequests.joining.GroupJoinUpdateRequiredBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.ringrtc.RemotePeer;
 import org.thoughtcrime.securesms.service.WebRtcCallService;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
 

app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java

@@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import com.bumptech.glide.Priority;

app/src/main/java/org/thoughtcrime/securesms/util/ConversationUtil.java

@@ -13,6 +13,8 @@ import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -20,11 +22,9 @@ import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobs.ConversationShortcutUpdateJob;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 
 import java.util.ArrayList;
 import java.util.Collections;

app/src/main/java/org/thoughtcrime/securesms/util/Conversions.java

@@ -1,180 +0,0 @@
-/**
- * Copyright (C) 2014 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms.util;
-
-public class Conversions {
-
-  public static byte intsToByteHighAndLow(int highValue, int lowValue) {
-    return (byte)((highValue << 4 | lowValue) & 0xFF);
-  }
-
-  public static int highBitsToInt(byte value) {
-    return (value & 0xFF) >> 4;
-  }
-
-  public static int lowBitsToInt(byte value) {
-    return (value & 0xF);
-  }
-
-  public static int highBitsToMedium(int value) {
-    return (value >> 12);
-  }
-
-  public static int lowBitsToMedium(int value) {
-    return (value & 0xFFF);
-  }
-
-  public static byte[] shortToByteArray(int value) {
-    byte[] bytes = new byte[2];
-    shortToByteArray(bytes, 0, value);
-    return bytes;
-  }
-
-  public static int shortToByteArray(byte[] bytes, int offset, int value) {
-    bytes[offset+1] = (byte)value;
-    bytes[offset]   = (byte)(value >> 8);
-    return 2;
-  }
-
-  public static int shortToLittleEndianByteArray(byte[] bytes, int offset, int value) {
-    bytes[offset]   = (byte)value;
-    bytes[offset+1] = (byte)(value >> 8);
-    return 2;
-  }
-
-  public static byte[] mediumToByteArray(int value) {
-    byte[] bytes = new byte[3];
-    mediumToByteArray(bytes, 0, value);
-    return bytes;
-  }
-
-  public static int mediumToByteArray(byte[] bytes, int offset, int value) {
-    bytes[offset + 2] = (byte)value;
-    bytes[offset + 1] = (byte)(value >> 8);
-    bytes[offset]     = (byte)(value >> 16);
-    return 3;
-  }
-
-  public static byte[] intToByteArray(int value) {
-    byte[] bytes = new byte[4];
-    intToByteArray(bytes, 0, value);
-    return bytes;
-  }
-
-  public static int intToByteArray(byte[] bytes, int offset, int value) {
-    bytes[offset + 3] = (byte)value;
-    bytes[offset + 2] = (byte)(value >> 8);
-    bytes[offset + 1] = (byte)(value >> 16);
-    bytes[offset]     = (byte)(value >> 24);
-    return 4;
-  }
-
-  public static int intToLittleEndianByteArray(byte[] bytes, int offset, int value) {
-    bytes[offset]   = (byte)value;
-    bytes[offset+1] = (byte)(value >> 8);
-    bytes[offset+2] = (byte)(value >> 16);
-    bytes[offset+3] = (byte)(value >> 24);
-    return 4;
-  }
-
-  public static byte[] longToByteArray(long l) {
-    byte[] bytes = new byte[8];
-    longToByteArray(bytes, 0, l);
-    return bytes;
-  }
-
-  public static int longToByteArray(byte[] bytes, int offset, long value) {
-    bytes[offset + 7] = (byte)value;
-    bytes[offset + 6] = (byte)(value >> 8);
-    bytes[offset + 5] = (byte)(value >> 16);
-    bytes[offset + 4] = (byte)(value >> 24);
-    bytes[offset + 3] = (byte)(value >> 32);
-    bytes[offset + 2] = (byte)(value >> 40);
-    bytes[offset + 1] = (byte)(value >> 48);
-    bytes[offset]     = (byte)(value >> 56);
-    return 8;
-  }
-
-  public static int longTo4ByteArray(byte[] bytes, int offset, long value) {
-    bytes[offset + 3] = (byte)value;
-    bytes[offset + 2] = (byte)(value >> 8);
-    bytes[offset + 1] = (byte)(value >> 16);
-    bytes[offset + 0] = (byte)(value >> 24);
-    return 4;
-  }
-
-  public static int byteArrayToShort(byte[] bytes) {
-    return byteArrayToShort(bytes, 0);
-  }
-
-  public static int byteArrayToShort(byte[] bytes, int offset) {
-    return
-      (bytes[offset] & 0xff) << 8 | (bytes[offset + 1] & 0xff);
-  }
-
-  // The SSL patented 3-byte Value.
-  public static int byteArrayToMedium(byte[] bytes, int offset) {
-    return
-      (bytes[offset]     & 0xff) << 16 |
-      (bytes[offset + 1] & 0xff) << 8  |
-      (bytes[offset + 2] & 0xff);
-  }
-
-  public static int byteArrayToInt(byte[] bytes) {
-    return byteArrayToInt(bytes, 0);
-  }
-
-  public static int byteArrayToInt(byte[] bytes, int offset)  {
-    return
-      (bytes[offset]     & 0xff) << 24 |
-      (bytes[offset + 1] & 0xff) << 16 |
-      (bytes[offset + 2] & 0xff) << 8  |
-      (bytes[offset + 3] & 0xff);
-  }
-
-  public static int byteArrayToIntLittleEndian(byte[] bytes, int offset) {
-    return
-      (bytes[offset + 3] & 0xff) << 24 |
-      (bytes[offset + 2] & 0xff) << 16 |
-      (bytes[offset + 1] & 0xff) << 8  |
-      (bytes[offset]     & 0xff);
-  }
-
-  public static long byteArrayToLong(byte[] bytes) {
-    return byteArrayToLong(bytes, 0);
-  }
-
-  public static long byteArray4ToLong(byte[] bytes, int offset) {
-    return
-        ((bytes[offset + 0] & 0xffL) << 24) |
-        ((bytes[offset + 1] & 0xffL) << 16) |
-        ((bytes[offset + 2] & 0xffL) << 8)  |
-        ((bytes[offset + 3] & 0xffL));
-  }
-
-  public static long byteArrayToLong(byte[] bytes, int offset) {
-    return
-      ((bytes[offset]     & 0xffL) << 56) |
-      ((bytes[offset + 1] & 0xffL) << 48) |
-      ((bytes[offset + 2] & 0xffL) << 40) |
-      ((bytes[offset + 3] & 0xffL) << 32) |
-      ((bytes[offset + 4] & 0xffL) << 24) |
-      ((bytes[offset + 5] & 0xffL) << 16) |
-      ((bytes[offset + 6] & 0xffL) << 8)  |
-      ((bytes[offset + 7] & 0xffL));
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java

@@ -24,13 +24,12 @@ import android.text.format.DateFormat;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
 
 import java.text.DateFormatSymbols;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;

app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java

@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
+
 import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.R;

app/src/main/java/org/thoughtcrime/securesms/util/DiffHelper.java

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.util;
 import androidx.annotation.NonNull;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Set;
 
 /**

app/src/main/java/org/thoughtcrime/securesms/util/DrawableUtil.java

@@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
-import androidx.camera.core.impl.SingleImageProxyBundle;
 import androidx.core.graphics.drawable.DrawableCompat;
 
 public final class DrawableUtil {

app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java

@@ -9,8 +9,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatDelegate;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
 
 public class DynamicTheme {
 

app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java

@@ -9,13 +9,13 @@ import com.annimon.stream.Stream;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.jobs.RemoteConfigRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.Log;
 
 import java.util.HashMap;
 import java.util.HashSet;

app/src/main/java/org/thoughtcrime/securesms/util/FileProviderUtil.java

@@ -4,6 +4,7 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
+
 import androidx.annotation.NonNull;
 import androidx.core.content.FileProvider;
 

app/src/main/java/org/thoughtcrime/securesms/util/FrameRateTracker.java

@@ -6,7 +6,7 @@ import android.view.Display;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;

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.logging.Log;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.thoughtcrime.securesms.R;
@@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.groups.BadGroupIdException;
 import org.thoughtcrime.securesms.groups.GroupId;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MessageGroupContext;
 import org.thoughtcrime.securesms.mms.OutgoingGroupUpdateMessage;
 import org.thoughtcrime.securesms.recipients.Recipient;

app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java

@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
@@ -16,9 +17,7 @@ import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
 import org.thoughtcrime.securesms.database.MessageDatabase;
 import org.thoughtcrime.securesms.database.MessageDatabase.InsertResult;
-import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.IncomingIdentityDefaultMessage;

app/src/main/java/org/thoughtcrime/securesms/util/IntentUtils.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.pm.LabeledIntent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 

app/src/main/java/org/thoughtcrime/securesms/util/InterceptableLongClickCopyLinkSpan.java

@@ -4,8 +4,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
-
 /**
  * Passes clicked Urls to the supplied {@link UrlClickHandler}.
  */

app/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java

@@ -9,7 +9,6 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 
 public class JsonUtils {

app/src/main/java/org/thoughtcrime/securesms/util/LeakyBucketLimiter.java

@@ -6,7 +6,7 @@ import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.core.os.HandlerCompat;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 /**
  * Imagine a bucket. Now imagine your tasks as little droplets. As your tasks are thrown into the

app/src/main/java/org/thoughtcrime/securesms/util/LifecycleCursorWrapper.java

@@ -6,9 +6,7 @@ import android.database.CursorWrapper;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.OnLifecycleEvent;
 
 /**
  * Wraps a {@link Cursor} that will be closed automatically when the {@link Lifecycle.Event}.ON_DESTROY

app/src/main/java/org/thoughtcrime/securesms/util/LinkedBlockingLifoQueue.java

@@ -1,23 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-
-import java.util.concurrent.LinkedBlockingDeque;
-
-public class LinkedBlockingLifoQueue<E> extends LinkedBlockingDeque<E> {
-  @Override
-  public void put(E runnable) throws InterruptedException {
-    super.putFirst(runnable);
-  }
-
-  @Override
-  public boolean add(E runnable) {
-    super.addFirst(runnable);
-    return true;
-  }
-
-  @Override
-  public boolean offer(E runnable) {
-    super.addFirst(runnable);
-    return true;
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java

@@ -3,13 +3,14 @@ package org.thoughtcrime.securesms.util;
 import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.Context;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.URLSpan;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+
 import org.thoughtcrime.securesms.R;
 
 public class LongClickCopySpan extends URLSpan {

app/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
-import androidx.core.content.ContextCompat;
 import android.text.Layout;
 import android.text.Selection;
 import android.text.Spannable;
@@ -13,6 +12,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
+
 import org.thoughtcrime.securesms.R;
 
 public class LongClickMovementMethod extends LinkMovementMethod {

app/src/main/java/org/thoughtcrime/securesms/util/MappingAdapter.java

@@ -7,14 +7,12 @@ import android.view.ViewGroup;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
 
 import org.whispersystems.libsignal.util.guava.Function;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 

app/src/main/java/org/thoughtcrime/securesms/util/MappingViewHolder.java

@@ -5,10 +5,7 @@ import android.view.View;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
-import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleRegistry;
-import androidx.recyclerview.widget.RecyclerView;
 
 public abstract class MappingViewHolder<Model extends MappingModel<Model>> extends LifecycleViewHolder implements LifecycleOwner {
 

app/src/main/java/org/thoughtcrime/securesms/util/MathUtils.java

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.graphics.PointF;
+
 import androidx.annotation.NonNull;
 
 public class MathUtils {

app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java

@@ -21,10 +21,10 @@ import androidx.annotation.WorkerThread;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.DocumentSlide;

app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileDescriptor.java

@@ -6,7 +6,7 @@ import android.os.ParcelFileDescriptor;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.io.Closeable;
 import java.io.FileDescriptor;

app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileDescriptorProxy.java

@@ -13,7 +13,7 @@ import android.system.OsConstants;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/org/thoughtcrime/securesms/util/ObservingLiveData.java

@@ -1,9 +1,11 @@
 package org.thoughtcrime.securesms.util;
 
-import androidx.lifecycle.MutableLiveData;
 import android.database.ContentObserver;
-import androidx.annotation.NonNull;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import org.signal.core.util.StreamUtil;
 import org.thoughtcrime.securesms.database.ObservableContent;
 
 import java.io.Closeable;
@@ -22,7 +24,7 @@ public class ObservingLiveData<E extends ObservableContent> extends MutableLiveD
 
     if (previous != null) {
       previous.unregisterContentObserver(observer);
-      Util.close(previous);
+      StreamUtil.close(previous);
     }
 
     value.registerContentObserver(observer);
@@ -35,7 +37,7 @@ public class ObservingLiveData<E extends ObservableContent> extends MutableLiveD
 
     if (value != null) {
       value.unregisterContentObserver(observer);
-      Util.close(value);
+      StreamUtil.close(value);
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/util/ParcelUtil.java

@@ -5,8 +5,6 @@ import android.os.Parcelable;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.attachments.AttachmentId;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;

app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java

@@ -4,11 +4,12 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import org.thoughtcrime.securesms.logging.Log;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
+import org.signal.core.util.logging.Log;
+
 public class PlayServicesUtil {
 
   private static final String TAG = PlayServicesUtil.class.getSimpleName();

app/src/main/java/org/thoughtcrime/securesms/util/PopulationFeatureFlags.java

@@ -6,7 +6,7 @@ import androidx.annotation.VisibleForTesting;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.HashMap;

app/src/main/java/org/thoughtcrime/securesms/util/PowerManagerCompat.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.util;
 
 import android.os.Build;
 import android.os.PowerManager;
+
 import androidx.annotation.NonNull;
 
 public class PowerManagerCompat {

app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java

@@ -5,18 +5,15 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
-import androidx.navigation.ActionOnlyNavDirections;
 
-import org.signal.zkgroup.VerificationFailedException;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
@@ -27,7 +24,6 @@ import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.internal.util.concurrent.CascadingFuture;

app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeprecation.java

@@ -7,12 +7,11 @@ import androidx.annotation.VisibleForTesting;
 import com.annimon.stream.Stream;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.logging.Log;
 
 import java.io.IOException;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 public final class RemoteDeprecation {
 

app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java

@@ -21,13 +21,13 @@ import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
+
 import androidx.annotation.ArrayRes;
 import androidx.annotation.AttrRes;
 import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.appcompat.content.res.AppCompatResources;
-import android.util.TypedValue;
 
 public class ResUtil {
 

app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java

@@ -16,8 +16,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
+import org.signal.core.util.StreamUtil;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.libsignal.util.Pair;
@@ -106,12 +107,12 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
 
       if (Objects.equals(outputUri.getScheme(), ContentResolver.SCHEME_FILE)) {
         try (OutputStream outputStream = new FileOutputStream(mediaUri.getPath())) {
-          Util.copy(inputStream, outputStream);
+          StreamUtil.copy(inputStream, outputStream);
           MediaScannerConnection.scanFile(context, new String[]{mediaUri.getPath()}, new String[]{contentType}, null);
         }
       } else {
         try (OutputStream outputStream = context.getContentResolver().openOutputStream(mediaUri, "w")) {
-          Util.copy(inputStream, outputStream);
+          StreamUtil.copy(inputStream, outputStream);
         }
       }
     }

app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java

@@ -1,12 +1,13 @@
 package org.thoughtcrime.securesms.util;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.CharacterStyle;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.annimon.stream.Stream;
 
 import org.whispersystems.libsignal.util.Pair;

app/src/main/java/org/thoughtcrime/securesms/util/SemanticVersion.java

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.util;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.annimon.stream.ComparatorCompat;

app/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java

@@ -15,11 +15,6 @@ import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.os.PowerManager;
 import android.os.Vibrator;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.core.content.ContextCompat;
-
 import android.os.storage.StorageManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -27,6 +22,11 @@ import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
 import android.view.inputmethod.InputMethodManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+
 public class ServiceUtil {
   public static InputMethodManager getInputMethodManager(Context context) {
     return (InputMethodManager)context.getSystemService(Context.INPUT_METHOD_SERVICE);

app/src/main/java/org/thoughtcrime/securesms/util/ShortCodeUtil.java

@@ -7,7 +7,7 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
 import com.google.i18n.phonenumbers.ShortNumberInfo;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.util.HashSet;
 import java.util.Set;

app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java

@@ -0,0 +1,27 @@
+package org.thoughtcrime.securesms.util;
+
+import androidx.annotation.NonNull;
+
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+
+public class SignalUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
+
+  private static final String TAG = SignalUncaughtExceptionHandler.class.getSimpleName();
+
+  private final Thread.UncaughtExceptionHandler originalHandler;
+
+  public SignalUncaughtExceptionHandler(@NonNull Thread.UncaughtExceptionHandler originalHandler) {
+    this.originalHandler = originalHandler;
+  }
+
+  @Override
+  public void uncaughtException(Thread t, Throwable e) {
+    Log.e(TAG, "", e);
+    SignalStore.blockUntilAllWritesFinished();
+    Log.blockUntilAllWritesFinished();
+    ApplicationDependencies.getJobManager().flush();
+    originalHandler.uncaughtException(t, e);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java

@@ -16,14 +16,14 @@
 
 package org.thoughtcrime.securesms.util;
 
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Observer;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java

@@ -17,7 +17,8 @@
 package org.thoughtcrime.securesms.util;
 
 import android.telephony.SmsMessage;
-import org.thoughtcrime.securesms.logging.Log;
+
+import org.signal.core.util.logging.Log;
 
 public class SmsCharacterCalculator extends CharacterCalculator {
 

app/src/main/java/org/thoughtcrime/securesms/util/SnapToTopDataObserver.java

@@ -6,7 +6,7 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.util.Objects;
 

app/src/main/java/org/thoughtcrime/securesms/util/SoftHashMap.java

@@ -23,7 +23,14 @@ import androidx.annotation.NonNull;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.locks.ReentrantLock;

app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java

@@ -1,10 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
-import android.content.Context;
-import android.graphics.PorterDuff;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.Build;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -14,13 +11,8 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
-import android.text.style.URLSpan;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-
-import org.thoughtcrime.securesms.R;
 
 public class SpanUtil {
 

app/src/main/java/org/thoughtcrime/securesms/util/SqlUtil.java

@@ -13,7 +13,6 @@ import org.whispersystems.libsignal.util.guava.Preconditions;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

app/src/main/java/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java

@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.util.LinkedList;
 import java.util.List;

app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java

@@ -3,10 +3,11 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.net.ConnectivityManager;
-import androidx.annotation.NonNull;
 import android.telephony.TelephonyManager;
 
-import org.thoughtcrime.securesms.logging.Log;
+import androidx.annotation.NonNull;
+
+import org.signal.core.util.logging.Log;
 
 import java.util.Locale;
 

app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java

@@ -14,13 +14,12 @@ import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 
 import org.greenrobot.eventbus.EventBus;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver;
 import org.thoughtcrime.securesms.keyvalue.SettingsValues;
 import org.thoughtcrime.securesms.lock.RegistrationLockReminders;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
-import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 

app/src/main/java/org/thoughtcrime/securesms/util/ThemeUtil.java

@@ -4,19 +4,17 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
-import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.core.content.ContextCompat;
-
-import android.graphics.drawable.Drawable;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
 
 import org.thoughtcrime.securesms.R;
 

app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.java

@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.whispersystems.libsignal.util.guava.Optional;

app/src/main/java/org/thoughtcrime/securesms/util/Util.java

@@ -47,19 +47,16 @@ import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
 
+import org.signal.core.util.LinkedBlockingLifoQueue;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.components.ComposeText;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.OutgoingLegacyMmsConnection;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.EOFException;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -255,79 +252,6 @@ public class Util {
     }
   }
 
-  public static void close(@Nullable Closeable closeable) {
-    if (closeable == null) return;
-
-    try {
-      closeable.close();
-    } catch (IOException e) {
-      Log.w(TAG, e);
-    }
-  }
-
-  public static long getStreamLength(InputStream in) throws IOException {
-    byte[] buffer    = new byte[4096];
-    int    totalSize = 0;
-
-    int read;
-
-    while ((read = in.read(buffer)) != -1) {
-      totalSize += read;
-    }
-
-    return totalSize;
-  }
-
-  public static void readFully(InputStream in, byte[] buffer) throws IOException {
-    readFully(in, buffer, buffer.length);
-  }
-
-  public static void readFully(InputStream in, byte[] buffer, int len) throws IOException {
-    int offset = 0;
-
-    for (;;) {
-      int read = in.read(buffer, offset, len - offset);
-      if (read == -1) throw new EOFException("Stream ended early");
-
-      if (read + offset < len) offset += read;
-      else                		 return;
-    }
-  }
-
-  public static byte[] readFully(InputStream in) throws IOException {
-    ByteArrayOutputStream bout = new ByteArrayOutputStream();
-    byte[] buffer              = new byte[4096];
-    int read;
-
-    while ((read = in.read(buffer)) != -1) {
-      bout.write(buffer, 0, read);
-    }
-
-    in.close();
-
-    return bout.toByteArray();
-  }
-
-  public static String readFullyAsString(InputStream in) throws IOException {
-    return new String(readFully(in));
-  }
-
-  public static long copy(InputStream in, OutputStream out) throws IOException {
-    byte[] buffer = new byte[8192];
-    int read;
-    long total = 0;
-
-    while ((read = in.read(buffer)) != -1) {
-      out.write(buffer, 0, read);
-      total += read;
-    }
-
-    in.close();
-    out.close();
-
-    return total;
-  }
-
   @RequiresPermission(anyOf = {
       android.Manifest.permission.READ_PHONE_STATE,
       android.Manifest.permission.READ_SMS,

app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.java

@@ -5,8 +5,8 @@ import android.content.pm.PackageManager;
 
 import androidx.annotation.NonNull;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.Log;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;

app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java

@@ -3,10 +3,11 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 public class WakeLockUtil {
 

app/src/main/java/org/thoughtcrime/securesms/util/adapter/StableIdGenerator.java

@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.util.adapter;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
-
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.HashMap;

app/src/main/java/org/thoughtcrime/securesms/util/concurrent/FilteredExecutor.java

@@ -2,8 +2,6 @@ package org.thoughtcrime.securesms.util.concurrent;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.util.Util;
-
 import java.util.concurrent.Executor;
 
 /**

app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.util.concurrent;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 

app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java

@@ -1,109 +0,0 @@
-package org.thoughtcrime.securesms.util.concurrent;
-
-import android.os.HandlerThread;
-
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.util.LinkedBlockingLifoQueue;
-
-import java.util.Queue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.LinkedTransferQueue;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public final class SignalExecutors {
-
-  public static final ExecutorService UNBOUNDED = Executors.newCachedThreadPool(new NumberedThreadFactory("signal-unbounded"));
-  public static final ExecutorService BOUNDED   = Executors.newFixedThreadPool(getIdealThreadCount(), new NumberedThreadFactory("signal-bounded"));
-  public static final ExecutorService SERIAL    = Executors.newSingleThreadExecutor(new NumberedThreadFactory("signal-serial"));
-
-  private SignalExecutors() {}
-
-  public static ExecutorService newCachedSingleThreadExecutor(final String name) {
-    ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 15, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), r -> new Thread(r, name));
-    executor.allowCoreThreadTimeOut(true);
-    return executor;
-  }
-
-  /**
-   * ThreadPoolExecutor will only create a new thread if the provided queue returns false from
-   * offer(). That means if you give it an unbounded queue, it'll only ever create 1 thread, no
-   * matter how long the queue gets.
-   *
-   * But if you bound the queue and submit more runnables than there are threads, your task is
-   * rejected and throws an exception.
-   *
-   * So we make a queue that will always return false if it's non-empty to ensure new threads get
-   * created. Then, if a task gets rejected, we simply add it to the queue.
-   */
-  public static ExecutorService newCachedBoundedExecutor(final String name, int minThreads, int maxThreads) {
-    ThreadPoolExecutor threadPool = new ThreadPoolExecutor(minThreads,
-                                                           maxThreads,
-                                                           30,
-                                                           TimeUnit.SECONDS,
-                                                           new LinkedBlockingQueue<Runnable>() {
-                                                             @Override
-                                                             public boolean offer(Runnable runnable) {
-                                                               if (isEmpty()) {
-                                                                 return super.offer(runnable);
-                                                               } else {
-                                                                 return false;
-                                                               }
-                                                             }
-                                                           }, new NumberedThreadFactory(name));
-
-    threadPool.setRejectedExecutionHandler((runnable, executor) -> {
-      try {
-        executor.getQueue().put(runnable);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
-    });
-
-    return threadPool;
-  }
-
-  /**
-   * Returns an executor that prioritizes newer work. This is the opposite of a traditional executor,
-   * which processor work in FIFO order.
-   */
-  public static ExecutorService newFixedLifoThreadExecutor(String name, int minThreads, int maxThreads) {
-    return new ThreadPoolExecutor(minThreads, maxThreads, 0, TimeUnit.MILLISECONDS, new LinkedBlockingLifoQueue<>(), new NumberedThreadFactory(name));
-  }
-
-  public static HandlerThread getAndStartHandlerThread(@NonNull String name) {
-    HandlerThread handlerThread = new HandlerThread(name);
-    handlerThread.start();
-    return handlerThread;
-  }
-
-  /**
-   * Returns an 'ideal' thread count based on the number of available processors.
-   */
-  public static int getIdealThreadCount() {
-    return Math.max(2, Math.min(Runtime.getRuntime().availableProcessors() - 1, 4));
-  }
-
-  private static class NumberedThreadFactory implements ThreadFactory {
-
-    private final String        baseName;
-    private final AtomicInteger counter;
-
-    NumberedThreadFactory(@NonNull String baseName) {
-      this.baseName = baseName;
-      this.counter  = new AtomicInteger();
-    }
-
-    @Override
-    public Thread newThread(@NonNull Runnable r) {
-      return new Thread(r, baseName + "-" + counter.getAndIncrement());
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java

@@ -1,9 +1,11 @@
 package org.thoughtcrime.securesms.util.concurrent;
 
-import androidx.lifecycle.Lifecycle;
 import android.os.AsyncTask;
-import androidx.annotation.NonNull;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+
+import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.concurrent.Executor;

app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java

@@ -2,14 +2,15 @@ package org.thoughtcrime.securesms.util.dualsim;
 
 import android.content.Context;
 import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.whispersystems.libsignal.util.guava.Function;
 import org.whispersystems.libsignal.util.guava.Optional;

app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.util.dynamiclanguage;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
+
 import androidx.annotation.Nullable;
 import androidx.core.os.ConfigurationCompat;
 

app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataTriple.java

@@ -6,7 +6,6 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MediatorLiveData;
 
 import org.thoughtcrime.securesms.util.Triple;
-import org.whispersystems.libsignal.util.Pair;
 
 public final class LiveDataTriple<A, B, C> extends MediatorLiveData<Triple<A, B, C>> {
   private A a;

app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataUtil.java

@@ -9,8 +9,8 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.function.Predicate;
 
+import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.whispersystems.libsignal.util.guava.Function;
 
 import java.util.LinkedHashSet;

app/src/main/java/org/thoughtcrime/securesms/util/paging/SizeFixResult.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util.paging;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 import java.util.List;
 

app/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java

@@ -1,10 +1,11 @@
 package org.thoughtcrime.securesms.util.spans;
 
 
-import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.MetricAffectingSpan;
 
+import androidx.annotation.NonNull;
+
 public class CenterAlignedRelativeSizeSpan extends MetricAffectingSpan {
 
   private final float relativeSize;

app/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java

@@ -11,7 +11,7 @@ import androidx.lifecycle.Lifecycle;
 
 import com.google.android.material.snackbar.Snackbar;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 public abstract class SnackbarAsyncTask<Params>
     extends AsyncTask<Params, Void, Void>

app/src/main/java/org/thoughtcrime/securesms/util/views/DarkOverflowToolbar.java

@@ -9,7 +9,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 
 /**
  * It seems to be impossible to tint the overflow icon in an ActionMode independently from the

app/src/main/java/org/thoughtcrime/securesms/util/views/LearnMoreTextView.java

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.util.views;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;

app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java

@@ -7,8 +7,8 @@ import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.concurrent.atomic.AtomicLong;

app/src/main/java/org/thoughtcrime/securesms/util/views/Stub.java

@@ -1,9 +1,10 @@
 package org.thoughtcrime.securesms.util.views;
 
 
-import androidx.annotation.NonNull;
 import android.view.ViewStub;
 
+import androidx.annotation.NonNull;
+
 public class Stub<T> {
 
   private ViewStub viewStub;