From c9ebcc580f3b5bfe96050bf999be44a2ce063a63 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:26:08 +1000 Subject: [PATCH] Move files --- .../securesms/BindableConversationItem.java | 2 +- .../securesms/MessageDetailsActivity.java | 2 +- .../attachments/DatabaseAttachmentProvider.kt | 2 +- .../securesms/audio/AudioSlidePlayer.java | 2 +- .../securesms/backup/FullBackupExporter.kt | 2 +- .../securesms/backup/FullBackupImporter.kt | 2 +- .../securesms/components/DocumentView.java | 3 +-- .../securesms/components/InputPanel.java | 2 +- .../securesms/components/ThumbnailView.java | 2 +- .../components/camera/CameraView.java | 2 +- .../components/emoji/EmojiPages.java | 2 +- .../components/emoji/EmojiProvider.java | 2 +- .../components/emoji/EmojiTextView.java | 2 +- .../contactshare/ContactModelMapper.java | 2 +- .../conversation/ConversationActivity.java | 4 ++-- .../conversation/ConversationAdapter.java | 2 +- .../conversation/ConversationFragment.java | 2 +- .../conversation/ConversationItem.java | 2 +- .../conversation/ConversationUpdateItem.java | 2 +- .../crypto/IdentityKeyParcelable.java | 4 ++-- .../securesms/database/GroupDatabase.java | 2 +- .../securesms/database/MessagingDatabase.java | 2 +- .../securesms/database/MmsDatabase.java | 2 +- .../securesms/database/PushDatabase.java | 2 +- .../securesms/database/RecipientDatabase.java | 2 +- .../securesms/database/SmsDatabase.java | 2 +- .../securesms/database/Storage.kt | 4 ++-- .../securesms/database/ThreadDatabase.java | 4 ++-- .../database/loaders/ConversationLoader.java | 2 +- .../securesms/jobs/AvatarDownloadJob.java | 4 ++-- .../linkpreview/LinkPreviewRepository.java | 2 +- .../linkpreview/LinkPreviewUtil.java | 2 +- .../linkpreview/LinkPreviewViewModel.java | 2 +- .../loki/activities/LinkDeviceActivity.kt | 2 +- .../RecoveryPhraseRestoreActivity.kt | 2 +- .../loki/activities/RegisterActivity.kt | 2 +- .../longmessage/LongMessageRepository.java | 2 +- .../longmessage/LongMessageViewModel.java | 2 +- .../mediapreview/MediaPreviewViewModel.java | 2 +- .../securesms/mediasend/Media.java | 2 +- .../mediasend/MediaPickerFolderFragment.java | 4 ++-- .../securesms/mediasend/MediaRepository.java | 2 +- .../mediasend/MediaSendActivity.java | 2 +- .../mediasend/MediaSendFragment.java | 2 +- .../mediasend/MediaSendViewModel.java | 2 +- .../securesms/mms/AttachmentManager.java | 2 +- .../mms/AttachmentStreamLocalUriFetcher.java | 4 ++-- .../mms/AttachmentStreamUriLoader.java | 2 +- .../org/thoughtcrime/securesms/mms/Slide.java | 2 +- .../thoughtcrime/securesms/mms/SlideDeck.java | 2 +- .../securesms/net/CallRequestController.java | 2 +- .../securesms/net/ChunkedDataFetcher.java | 4 ++-- .../service/ExpiringMessageManager.java | 2 +- .../service/GenericForegroundService.java | 2 +- .../thoughtcrime/securesms/util/BackupUtil.kt | 2 +- .../securesms/util/SearchUtil.java | 2 +- .../service/VerificationCodeParserTest.java | 2 +- .../securesms/util/SearchUtilTest.java | 2 +- .../documents/IdentityKeyMismatch.java | 4 ++-- .../avatars/GroupRecordContactPhoto.java | 2 +- .../messages/signal/IncomingMediaMessage.java | 2 +- .../messages/signal/IncomingTextMessage.java | 2 +- .../messaging/messages/visible/Attachment.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 2 +- .../ReceivedMessageHandler.kt | 2 +- .../attachments/PointerAttachment.java | 2 +- .../attachments/SessionServiceAttachment.kt | 2 +- .../SessionServiceAttachmentPointer.kt | 2 +- .../SessionServiceAttachmentStream.kt | 2 +- .../link_preview/LinkPreview.java | 2 +- .../libsession/messaging/threads/Address.kt | 2 +- .../threads/recipients/Recipient.java | 2 +- .../threads/recipients/RecipientProvider.java | 2 +- .../session/libsession/utilities/AESGCM.kt | 2 +- .../libsession/utilities/IdentityKeyUtil.java | 6 ++--- .../{libsignal => crypto}/IdentityKey.java | 4 ++-- .../IdentityKeyPair.java | 2 +- .../session/libsignal/crypto/ecc/Curve.java | 2 +- .../libsignal/crypto/ecc/DjbECPublicKey.java | 2 +- .../InvalidKeyException.java | 2 +- .../InvalidMacException.java | 2 +- .../InvalidMessageException.java | 2 +- .../InvalidMetadataMessageException.java | 2 +- .../InvalidVersionException.java | 2 +- .../ProtocolException.java | 2 +- .../ProtocolInvalidMessageException.java | 4 +--- .../libsignal/state/IdentityKeyStore.java | 23 ------------------- .../api/SignalServiceMessageReceiver.java | 2 +- .../api/messages/SignalServiceAttachment.java | 4 +--- .../SignalServiceAttachmentPointer.java | 2 +- .../SignalServiceAttachmentStream.java | 2 +- .../api/messages/SignalServiceContent.java | 2 +- .../messages/SignalServiceDataMessage.java | 2 +- .../api/messages/SignalServiceGroup.java | 3 +-- .../api/messages/shared/SharedContact.java | 2 +- .../api/push/SignalServiceAddress.java | 2 +- .../streams/AttachmentCipherInputStream.java | 4 ++-- .../util => utilities}/ByteUtil.java | 2 +- .../libsignal/utilities/HexEncoding.kt | 2 +- .../util => utilities}/KeyHelper.java | 2 +- .../{libsignal/util => utilities}/Pair.java | 2 +- .../util => utilities}/guava/Absent.java | 5 ++-- .../util => utilities}/guava/Function.java | 4 +--- .../util => utilities}/guava/Optional.java | 5 ++-- .../guava/Preconditions.java | 5 +--- .../util => utilities}/guava/Present.java | 4 ++-- .../util => utilities}/guava/Supplier.java | 3 +-- 107 files changed, 122 insertions(+), 159 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/IdentityKey.java (92%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/IdentityKeyPair.java (94%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidKeyException.java (92%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidMacException.java (89%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidMessageException.java (92%) rename libsignal/src/main/java/org/session/libsignal/{metadata => exceptions}/InvalidMetadataMessageException.java (83%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidVersionException.java (86%) rename libsignal/src/main/java/org/session/libsignal/{metadata => exceptions}/ProtocolException.java (90%) rename libsignal/src/main/java/org/session/libsignal/{metadata => exceptions}/ProtocolInvalidMessageException.java (67%) delete mode 100644 libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/ByteUtil.java (99%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/KeyHelper.java (96%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/Pair.java (94%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Absent.java (93%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Function.java (97%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Optional.java (98%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Preconditions.java (99%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Present.java (94%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Supplier.java (95%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java index 5772505950..dcd88d23fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java index 707a522007..abed19ac22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index 43bf135274..7889f578bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index a33b8748a8..a7622306ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt index 9fed124912..cd3d0641a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt index d9e127a92e..b106ffd06c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java index 1301fa7286..d1d70fdac0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java +++ b/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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java index 05e91b9e17..ec1a38c9c2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 8546d95601..106fa45096 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java index f072960c65..11f6c4104b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java index 4f733856e2..436880edef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index 76dfe1bf13..47f73d45a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java index 2bddf9ca8f..28c8deced0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java +++ b/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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java index c724d443bb..7ed743f801 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index f6a32654ff..1fbdc0f593 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index b748a0945f..5a2e459dda 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 91b45536a5..ce0b17dade 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index b8acb80571..70c9caae8b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index 05fb371bf5..194b9779c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java index d8ddc61cfb..2bcfd310d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java +++ b/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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index 7f3d0cd97f..aa5aad182a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java index 026d6b48a6..6509c1a9f6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index 3d6510dcaa..4493f778e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index 6d63e2797a..e9d417de5d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java index 316822b406..4363250ec1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 15dc6003cf..43f3740346 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 416347a0b3..caa0be3987 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index f70ebabd11..b5db0dbec8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java index 591f104fed..b5d95ec50a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index 1058acdcfa..1f87d355cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index c2a9def90c..65f22aa23c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java index 7bf922ed3a..807c4548a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java index 6947801ec5..dbf8c4bf66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index 540f2edc9a..ecb5ae743a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt index d0f1fcb113..6d526395df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt index a4807c6f62..d7d071da76 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java index 1cc6e0bbd2..43896d904d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java index 34efe23fd5..27495a492a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java +++ b/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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java index 0babefc0e5..259579a59c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java index 2339d93551..4ae5194f85 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java +++ b/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. diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java index f670f9aabd..ff1248a679 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java index 7f515a4ad7..55c84d080c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index 191eca74ea..73fe916812 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java index 34b4c6c0e0..91820bf40a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index 89b0f4aa9e..5336503589 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index efad3ef832..f172f23155 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index db7f5fcddd..223166d65c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java index 56a733ba74..9549ad242a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java index 2eecd9a0de..f322d17091 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java index d58e2bc215..02ccf85518 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java b/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java index ac980b1382..1793cf2a1e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java index 5319cc6bfc..af37b86394 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index bf2cf9d77f..4fed24c7af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java index 02db92fc90..58ed5d7d75 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt index 6b3d1fabce..b597835e05 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt +++ b/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 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java index cee7f6afd5..8935780b1a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java +++ b/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; diff --git a/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java b/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java index ac198d549a..2696e8c712 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java +++ b/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; diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java index 4298567e42..4d0833c3fa 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java +++ b/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; diff --git a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java index 1f1517e841..01ee2e3069 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java +++ b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.session.libsession.messaging.threads.Address; import org.session.libsignal.utilities.Base64; -import org.session.libsignal.libsignal.IdentityKey; -import org.session.libsignal.libsignal.InvalidKeyException; +import org.session.libsignal.crypto.IdentityKey; +import org.session.libsignal.exceptions.InvalidKeyException; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java b/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java index 7967368e1f..dde2a633fc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java @@ -11,7 +11,7 @@ import org.session.libsession.messaging.StorageProtocol; import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.GroupRecord; import org.session.libsession.utilities.Conversions; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java index ed4b8b6df8..42bb18ff93 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java @@ -9,7 +9,7 @@ import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.utilities.GroupUtil; -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.SignalServiceGroup; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java index 690143a188..0e958d57ea 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java @@ -10,7 +10,7 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceGroup; public class IncomingTextMessage implements Parcelable { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt index 1630502671..ecfc3feb52 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt @@ -5,7 +5,7 @@ import android.webkit.MimeTypeMap import com.google.protobuf.ByteString import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment 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.SignalServiceAttachmentPointer import org.session.libsignal.service.internal.push.SignalServiceProtos import java.io.File diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index 792a15a9ab..7a07e2aef1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -14,7 +14,7 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.Curve import org.session.libsignal.crypto.ecc.ECKeyPair -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.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index da9be94210..956f3919ab 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -23,7 +23,7 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -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.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java index e1826d3ecc..2f038f913f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java @@ -5,7 +5,7 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -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.SignalServiceDataMessage; import org.session.libsignal.utilities.Base64; diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt index e7686da4c2..c96947cab0 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import com.google.protobuf.ByteString -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachment import java.io.InputStream diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt index ece1b30c3d..170a3b8ead 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt @@ -5,7 +5,7 @@ */ package org.session.libsession.messaging.sending_receiving.attachments -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional /** * Represents a received SignalServiceAttachment "handle." This diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt index 43a851a787..634557eddd 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt @@ -7,7 +7,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import android.util.Size import com.google.protobuf.ByteString -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment import java.io.InputStream diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java index 4a644b2e9b..8aa8102a60 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java @@ -10,7 +10,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; import org.session.libsignal.utilities.JsonUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt index abf14afcbc..33c83b036d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt @@ -7,7 +7,7 @@ import android.util.Pair import androidx.annotation.VisibleForTesting import org.session.libsession.utilities.DelimiterUtil import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.internal.util.Util import java.util.* import java.util.concurrent.atomic.AtomicReference diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java index 1d18543c86..6ccb2ded7b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java @@ -37,7 +37,7 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.color.MaterialColor; import org.session.libsignal.utilities.Log; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.GroupRecordContactPhoto; diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java index 2e634aa957..d38a70f965 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java @@ -24,7 +24,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.messaging.MessagingModuleConfiguration; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.utilities.color.MaterialColor; import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.GroupRecord; diff --git a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt index 102ef8dc1d..4de7266a41 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt @@ -1,7 +1,7 @@ package org.session.libsession.utilities import androidx.annotation.WorkerThread -import org.session.libsignal.libsignal.util.ByteUtil +import org.session.libsignal.utilities.ByteUtil import org.session.libsignal.service.internal.util.Util import org.session.libsignal.utilities.Hex import org.whispersystems.curve25519.Curve25519 diff --git a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java index ebbeef0a10..d42f5c2ac5 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java @@ -23,9 +23,9 @@ import android.content.SharedPreferences.Editor; import androidx.annotation.NonNull; import org.session.libsignal.crypto.ecc.ECPublicKey; -import org.session.libsignal.libsignal.IdentityKey; -import org.session.libsignal.libsignal.IdentityKeyPair; -import org.session.libsignal.libsignal.InvalidKeyException; +import org.session.libsignal.crypto.IdentityKey; +import org.session.libsignal.crypto.IdentityKeyPair; +import org.session.libsignal.exceptions.InvalidKeyException; import org.session.libsignal.crypto.ecc.Curve; import org.session.libsignal.crypto.ecc.ECKeyPair; import org.session.libsignal.crypto.ecc.ECPrivateKey; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java index 795f3bdbfe..ee9bfe7a6e 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java @@ -3,11 +3,11 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; - +package org.session.libsignal.crypto; import org.session.libsignal.crypto.ecc.Curve; import org.session.libsignal.crypto.ecc.ECPublicKey; +import org.session.libsignal.exceptions.InvalidKeyException; import org.session.libsignal.utilities.Hex; /** diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java rename to libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java index 65eedc7db1..daceacee76 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.crypto; import org.session.libsignal.crypto.ecc.ECPrivateKey; diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java index 7b7ad4f3d0..da03b2a41a 100644 --- a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java @@ -7,7 +7,7 @@ package org.session.libsignal.crypto.ecc; import org.whispersystems.curve25519.Curve25519; import org.whispersystems.curve25519.Curve25519KeyPair; -import org.session.libsignal.libsignal.InvalidKeyException; +import org.session.libsignal.exceptions.InvalidKeyException; import static org.whispersystems.curve25519.Curve25519.BEST; public class Curve { diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java index b3fcabf255..8cbf988f73 100644 --- a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java @@ -6,7 +6,7 @@ package org.session.libsignal.crypto.ecc; -import org.session.libsignal.libsignal.util.ByteUtil; +import org.session.libsignal.utilities.ByteUtil; import java.math.BigInteger; import java.util.Arrays; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidKeyException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidKeyException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java index 82ea00e42a..8347d36d63 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidKeyException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidKeyException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMacException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java similarity index 89% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMacException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java index b4c2ac7ce5..fed8369ff7 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMacException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidMacException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMessageException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java index 3a797e9249..1a8f9e38de 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMessageException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidMessageException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/metadata/InvalidMetadataMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/metadata/InvalidMetadataMessageException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java index 48fbe3909c..90a6407bac 100644 --- a/libsignal/src/main/java/org/session/libsignal/metadata/InvalidMetadataMessageException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java @@ -1,4 +1,4 @@ -package org.session.libsignal.metadata; +package org.session.libsignal.exceptions; public class InvalidMetadataMessageException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidVersionException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java similarity index 86% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidVersionException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java index b0ed28764e..d4ba2cffb7 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidVersionException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidVersionException extends Exception { public InvalidVersionException(String detailMessage) { diff --git a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java similarity index 90% rename from libsignal/src/main/java/org/session/libsignal/metadata/ProtocolException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java index b2d981841a..def434ad0e 100644 --- a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java @@ -1,4 +1,4 @@ -package org.session.libsignal.metadata; +package org.session.libsignal.exceptions; public abstract class ProtocolException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolInvalidMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java similarity index 67% rename from libsignal/src/main/java/org/session/libsignal/metadata/ProtocolInvalidMessageException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java index 6230fccaac..5371ac68ce 100644 --- a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolInvalidMessageException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java @@ -1,8 +1,6 @@ -package org.session.libsignal.metadata; +package org.session.libsignal.exceptions; -import org.session.libsignal.libsignal.InvalidMessageException; - public class ProtocolInvalidMessageException extends ProtocolException { public ProtocolInvalidMessageException(InvalidMessageException e, String sender, int senderDevice) { super(e, sender, senderDevice); diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java b/libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java deleted file mode 100644 index 4cc30bfc6b..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ -package org.session.libsignal.libsignal.state; - -import org.session.libsignal.libsignal.IdentityKeyPair; - -/** - * Provides an interface to identity information. - * - * @author Moxie Marlinspike - */ -public interface IdentityKeyStore { - /** - * Get the local client's identity key pair. - * - * @return The local client's persistent identity key pair. - */ - public IdentityKeyPair getIdentityKeyPair(); - -} diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java index ec8be2c45e..3f159be2f4 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api; -import org.session.libsignal.libsignal.InvalidMessageException; +import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; import org.session.libsignal.service.api.messages.SignalServiceDataMessage; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java index 04217da2e1..94bfc2fe25 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java @@ -6,9 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream; +import org.session.libsignal.utilities.guava.Optional; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java index f8a859b3bd..e5d9641dbf 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; /** diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java index b5df001012..b4d27ee422 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java index b216332623..0b6d2fbc53 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.internal.push.SignalServiceProtos; public class SignalServiceContent { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java index f65568bc42..8ce3dca98e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -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 org.session.libsignal.service.api.push.SignalServiceAddress; import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java index 5115844a12..87285bc4fb 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java @@ -6,8 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; +import org.session.libsignal.utilities.guava.Optional; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java index 6993eb8189..6a09521e4f 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java @@ -1,6 +1,6 @@ package org.session.libsignal.service.api.messages.shared; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceAttachment; import java.util.LinkedList; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java b/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java index 2aa3a7f0c4..4033aef2e0 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.push; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; /** * A class representing a message destination or origin. diff --git a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java index 4ad149698f..08924fa957 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java @@ -6,8 +6,8 @@ package org.session.libsignal.streams; -import org.session.libsignal.libsignal.InvalidMacException; -import org.session.libsignal.libsignal.InvalidMessageException; +import org.session.libsignal.exceptions.InvalidMacException; +import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.service.internal.util.Util; import java.io.File; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/ByteUtil.java b/libsignal/src/main/java/org/session/libsignal/utilities/ByteUtil.java similarity index 99% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/ByteUtil.java rename to libsignal/src/main/java/org/session/libsignal/utilities/ByteUtil.java index 45ad5d6461..e9f540d6b1 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/ByteUtil.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ByteUtil.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.util; +package org.session.libsignal.utilities; import org.session.libsignal.utilities.Hex; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt index d6ec9800be..70585af08b 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt @@ -1,6 +1,6 @@ package org.session.libsignal.service.loki.utilities -import org.session.libsignal.libsignal.IdentityKeyPair +import org.session.libsignal.crypto.IdentityKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair fun ByteArray.toHexString(): String { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java b/libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java rename to libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java index b276beb6bc..0c807d1b92 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.util; +package org.session.libsignal.utilities; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/Pair.java b/libsignal/src/main/java/org/session/libsignal/utilities/Pair.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/Pair.java rename to libsignal/src/main/java/org/session/libsignal/utilities/Pair.java index 430073f424..2f8de61a79 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/Pair.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Pair.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.util; +package org.session.libsignal.utilities; public class Pair { private final T1 v1; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Absent.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Absent.java similarity index 93% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Absent.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Absent.java index 1b7d8c1b26..c7dc282307 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Absent.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Absent.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; +package org.session.libsignal.utilities.guava; -import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull; +import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull; import java.util.Collections; import java.util.Set; - /** * Implementation of an {@link Optional} not containing a reference. */ diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Function.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Function.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Function.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Function.java index 5388b6ff1c..5e535d6cbe 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Function.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Function.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; - - +package org.session.libsignal.utilities.guava; /** * Determines an output value based on an input value. diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Optional.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Optional.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Optional.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Optional.java index c012c147dc..7ead442037 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Optional.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Optional.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; +package org.session.libsignal.utilities.guava; -import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull; +import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull; import java.io.Serializable; import java.util.Set; - /** * An immutable object that may contain a non-null reference to another object. Each * instance of this type either contains a non-null reference, or contains nothing (in diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Preconditions.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Preconditions.java similarity index 99% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Preconditions.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Preconditions.java index 55edc0d18b..70c88dd381 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Preconditions.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Preconditions.java @@ -14,13 +14,10 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; - +package org.session.libsignal.utilities.guava; import java.util.NoSuchElementException; - - /** * Simple static methods to be called at the start of your own methods to verify * correct arguments and state. This allows constructs such as diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Present.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Present.java index e44561bebd..7194ba1bff 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Present.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; +package org.session.libsignal.utilities.guava; -import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull; +import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull; import java.util.Collections; import java.util.Set; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Supplier.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Supplier.java similarity index 95% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Supplier.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Supplier.java index e7ca97ffc5..4ff0e12ca0 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Supplier.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Supplier.java @@ -14,8 +14,7 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; - +package org.session.libsignal.utilities.guava; /** * A class that can supply objects of a single type. Semantically, this could