Move files

2025-08-12 15:27:48 +00:00 · 2021-05-18 09:26:08 +10:00
parent 40d2fd25d9
commit c9ebcc580f
107 changed files with 122 additions and 159 deletions
--- 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;

--- 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;
--- 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;

--- 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 {
--- 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
--- 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
--- 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
--- 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;
--- 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

--- 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
--- 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
--- 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;

--- 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
--- 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;
--- 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;
--- 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
--- 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;