Move files

app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.threads.Address;

app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java

@@ -65,7 +65,7 @@ import org.session.libsession.messaging.threads.recipients.RecipientModifiedList
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.session.libsession.utilities.ExpirationUtil;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.lang.ref.WeakReference;
 import java.sql.Date;

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -10,7 +10,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.*
 import org.session.libsession.messaging.threads.Address
 import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsession.utilities.Util
-import org.session.libsignal.libsignal.util.guava.Optional
+import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.service.api.messages.SignalServiceAttachment
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream

app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java

@@ -40,7 +40,7 @@ import org.session.libsession.utilities.ServiceUtil;
 
 import org.session.libsession.utilities.Util;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt

@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.session.libsession.utilities.Util
 import org.session.libsignal.crypto.kdf.HKDFv3
-import org.session.libsignal.libsignal.util.ByteUtil
+import org.session.libsignal.utilities.ByteUtil
 import java.io.*
 import java.lang.Exception
 import java.security.InvalidAlgorithmParameterException

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt

@@ -20,7 +20,7 @@ import org.session.libsession.messaging.threads.Address
 import org.session.libsession.utilities.Conversions
 import org.session.libsession.utilities.Util
 import org.session.libsignal.crypto.kdf.HKDFv3
-import org.session.libsignal.libsignal.util.ByteUtil
+import org.session.libsignal.utilities.ByteUtil
 
 import java.io.*
 import java.security.InvalidAlgorithmParameterException

app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java

@@ -22,12 +22,11 @@ import org.greenrobot.eventbus.ThreadMode;
 import network.loki.messenger.R;
 
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 public class DocumentView extends FrameLayout {
 

app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java

@@ -39,7 +39,7 @@ import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.concurrent.AssertedSuccessListener;
 import org.session.libsignal.utilities.ListenableFuture;
 import org.session.libsignal.utilities.SettableFuture;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.util.concurrent.TimeUnit;
 

app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java

@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java

@@ -38,7 +38,7 @@ import android.view.ViewGroup;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import network.loki.messenger.R;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 import java.util.Arrays;
 import java.util.LinkedList;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java

@@ -26,7 +26,7 @@ import org.session.libsignal.utilities.Log;
 
 import org.session.libsession.utilities.FutureTaskListener;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 
 public class EmojiTextView extends AppCompatTextView {

app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.messages.shared.SharedContact;
 
 import java.util.ArrayList;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -112,8 +112,8 @@ import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.concurrent.AssertedSuccessListener;
 import org.session.libsession.utilities.views.Stub;
-import org.session.libsignal.libsignal.InvalidMessageException;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.exceptions.InvalidMessageException;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.loki.Mention;
 import org.session.libsignal.service.loki.utilities.HexEncodingKt;
 import org.session.libsignal.service.loki.utilities.PublicKeyValidation;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java

@@ -47,7 +47,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.LRUCache;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
 import org.session.libsession.utilities.Conversions;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -77,7 +77,7 @@ import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.concurrent.SimpleTask;
 import org.session.libsession.utilities.task.ProgressDialogAsyncTask;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.MessageDetailsActivity;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -70,7 +70,7 @@ import org.session.libsession.utilities.ThemeUtil;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.views.Stub;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.MediaPreviewActivity;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;

app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java

@@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.crypto;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import org.session.libsignal.libsignal.IdentityKey;
-import org.session.libsignal.libsignal.InvalidKeyException;
+import org.session.libsignal.crypto.IdentityKey;
+import org.session.libsignal.exceptions.InvalidKeyException;
 
 public class IdentityKeyParcelable implements Parcelable {
 

app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java

@@ -23,7 +23,7 @@ import org.session.libsession.messaging.threads.GroupRecord;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsession.utilities.Util;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
 import org.session.libsignal.service.loki.LokiOpenGroupDatabaseProtocol;
 

app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java

@@ -12,7 +12,7 @@ import org.session.libsession.database.documents.IdentityKeyMismatch;
 import org.session.libsession.database.documents.IdentityKeyMismatchList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.session.libsignal.utilities.Log;
-import org.session.libsignal.libsignal.IdentityKey;
+import org.session.libsignal.crypto.IdentityKey;
 
 import org.session.libsession.messaging.threads.Address;
 import org.session.libsignal.utilities.JsonUtil;

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -69,7 +69,7 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 
 import org.session.libsignal.utilities.Log;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.Closeable;
 import java.io.IOException;

app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java

@@ -10,7 +10,7 @@ import net.sqlcipher.database.SQLiteDatabase;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.session.libsignal.utilities.Base64;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
 import org.session.libsignal.service.internal.util.Util;
 

app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java

@@ -19,7 +19,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient.*;
 import org.session.libsignal.utilities.Base64;
 import org.session.libsession.utilities.Util;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.utilities.Log;
 
 import java.io.Closeable;

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -45,7 +45,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.IOException;
 import java.security.SecureRandom;

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -30,8 +30,8 @@ import org.session.libsession.utilities.IdentityKeyUtil
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.preferences.ProfileKeyUtil
 import org.session.libsignal.crypto.ecc.ECKeyPair
-import org.session.libsignal.libsignal.util.KeyHelper
-import org.session.libsignal.libsignal.util.guava.Optional
+import org.session.libsignal.utilities.KeyHelper
+import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
 import org.session.libsignal.service.api.messages.SignalServiceGroup
 import org.thoughtcrime.securesms.ApplicationContext

app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java

@@ -39,8 +39,8 @@ import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSe
 import org.session.libsession.utilities.DelimiterUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.Pair;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.Pair;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.contactshare.ContactUtil;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;

app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java

@@ -5,7 +5,7 @@ import android.database.Cursor;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.util.AbstractCursorLoader;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 public class ConversationLoader extends AbstractCursorLoader {
   private final long    threadId;

app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java

@@ -17,8 +17,8 @@ import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.session.libsignal.utilities.Hex;
-import org.session.libsignal.libsignal.InvalidMessageException;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.exceptions.InvalidMessageException;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
 import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException;

app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java

@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.net.CompositeRequestController;
 import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor;
 import org.thoughtcrime.securesms.net.RequestController;
 import org.thoughtcrime.securesms.providers.BlobProvider;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil.OpenGraph;
 

app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java

@@ -13,7 +13,7 @@ import android.text.util.Linkify;
 import com.annimon.stream.Stream;
 
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.utilities.Util;
 

app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java

@@ -11,7 +11,7 @@ import android.text.TextUtils;
 import org.thoughtcrime.securesms.net.RequestController;
 import org.session.libsession.utilities.Debouncer;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 

app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.libsignal.util.KeyHelper
+import org.session.libsignal.utilities.KeyHelper
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
 import org.session.libsignal.utilities.Hex

app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt

@@ -14,7 +14,7 @@ import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_recovery_phrase_restore.*
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.libsignal.util.KeyHelper
+import org.session.libsignal.utilities.KeyHelper
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
 import org.session.libsignal.utilities.Hex

app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt

@@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.activity_register.*
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.crypto.ecc.ECKeyPair
-import org.session.libsignal.libsignal.util.KeyHelper
+import org.session.libsignal.utilities.KeyHelper
 import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.session.libsession.utilities.KeyPairUtilities

app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.TextSlide;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.concurrent.SignalExecutors;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java

@@ -12,7 +12,7 @@ import android.os.Handler;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseContentProviders;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 class LongMessageViewModel extends ViewModel {
 

app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java

@@ -10,7 +10,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
 import org.thoughtcrime.securesms.mediasend.Media;
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java

@@ -5,7 +5,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 /**
  * Represents a piece of media that the user has on their device.

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mediasend;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
+
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Point;
@@ -21,7 +21,7 @@ import android.view.WindowManager;
 
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import network.loki.messenger.R;
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java

@@ -19,7 +19,7 @@ import com.annimon.stream.Stream;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java

@@ -21,7 +21,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
 
 import org.session.libsession.utilities.MediaTypes;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java

@@ -47,7 +47,7 @@ import org.thoughtcrime.securesms.scribbles.ImageEditorFragment;
 import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
 import org.thoughtcrime.securesms.util.PushCharacterCalculator;
 import org.thoughtcrime.securesms.util.Stopwatch;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.util.Collections;
 import java.util.HashMap;

app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java

@@ -51,7 +51,7 @@ import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.session.libsignal.utilities.ExternalStorageUtil;
 import org.thoughtcrime.securesms.util.FileProviderUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.threads.recipients.Recipient;

app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java

@@ -7,8 +7,8 @@ import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 
 import org.session.libsignal.utilities.Log;
-import org.session.libsignal.libsignal.InvalidMessageException;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.exceptions.InvalidMessageException;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.streams.AttachmentCipherInputStream;
 
 import java.io.File;

app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java

@@ -10,7 +10,7 @@ import com.bumptech.glide.load.model.ModelLoaderFactory;
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
 import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.File;
 import java.io.InputStream;

app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java

@@ -25,7 +25,7 @@ import androidx.annotation.Nullable;
 
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment;

app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java

@@ -24,7 +24,7 @@ import com.annimon.stream.Stream;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.util.LinkedList;
 import java.util.List;

app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java

@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.InputStream;
 

app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java

@@ -9,8 +9,8 @@ import com.bumptech.glide.util.ContentLengthInputStream;
 import org.session.libsignal.utilities.Log;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.concurrent.SignalExecutors;
-import org.session.libsignal.libsignal.util.Pair;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.Pair;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java

@@ -11,7 +11,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsession.utilities.SSKEnvironment;
 import org.session.libsession.utilities.TextSecurePreferences;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.messages.SignalServiceGroup;
 import org.session.libsignal.utilities.Log;
 

app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java

@@ -15,7 +15,7 @@ import androidx.core.content.ContextCompat;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
-import org.session.libsignal.libsignal.util.guava.Preconditions;
+import org.session.libsignal.utilities.guava.Preconditions;
 
 import network.loki.messenger.R;
 

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

@@ -14,7 +14,7 @@ import androidx.fragment.app.Fragment
 import network.loki.messenger.R
 import org.greenrobot.eventbus.EventBus
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.libsignal.util.ByteUtil
+import org.session.libsignal.utilities.ByteUtil
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.backup.BackupEvent
 import org.thoughtcrime.securesms.backup.BackupPassphrase

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

@@ -9,7 +9,7 @@ import android.text.style.CharacterStyle;
 
 import com.annimon.stream.Stream;
 
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 import java.util.Collections;
 import java.util.LinkedList;

app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.service;
 import org.junit.Before;
 import org.junit.Test;
 import org.thoughtcrime.securesms.BaseUnitTest;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import org.junit.Test;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 import java.util.Arrays;
 import java.util.List;