TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 15:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move protos

Browse Source
This commit is contained in:
Niels Andriesse
2021-05-18 09:44:06 +10:00
parent c124f86f6b
commit dc8938c269
52 changed files with 1261 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt
View File

@@ -1,7 +1,7 @@
package org.session.libsignal.crypto
import org.whispersystems.curve25519.Curve25519
import org.session.libsignal.service.internal.util.Util
import org.session.libsignal.utilities.Util
import javax.crypto.Cipher
import javax.crypto.spec.IvParameterSpec
import javax.crypto.spec.SecretKeySpec

2412
libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java → libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
View File

File diff suppressed because it is too large Load Diff

2
libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java
View File

@@ -7,7 +7,7 @@
package org.session.libsignal.service.api.messages;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.internal.push.SignalServiceProtos;
import org.session.libsignal.protos.SignalServiceProtos;
public class SignalServiceContent {
private final String sender;

2
libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java
View File

@@ -9,7 +9,7 @@ package org.session.libsignal.service.api.messages;
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;
import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage;
import java.util.LinkedList;
import java.util.List;

2
libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java
View File

@@ -9,7 +9,7 @@ package org.session.libsignal.service.api.messages;
import com.google.protobuf.ByteString;
import org.session.libsignal.service.api.push.SignalServiceAddress;
import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope;
import org.session.libsignal.protos.SignalServiceProtos.Envelope;
/**
* This class represents an encrypted Signal Service envelope.

2
libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java
View File

@@ -1,7 +1,7 @@
package org.session.libsignal.service.internal.push;
import org.session.libsignal.service.internal.push.http.OutputStreamFactory;
import org.session.libsignal.streams.OutputStreamFactory;
import java.io.InputStream;

2
libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java
View File

@@ -7,7 +7,7 @@
package org.session.libsignal.service.internal.push;
import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener;
import org.session.libsignal.service.internal.push.http.OutputStreamFactory;
import org.session.libsignal.streams.OutputStreamFactory;
import java.io.InputStream;

2
libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java
View File

@@ -8,7 +8,7 @@ package org.session.libsignal.streams;
import org.session.libsignal.exceptions.InvalidMacException;
import org.session.libsignal.exceptions.InvalidMessageException;
import org.session.libsignal.service.internal.util.Util;
import org.session.libsignal.utilities.Util;
import java.io.File;
import java.io.FileInputStream;

2
libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java
View File

@@ -6,7 +6,7 @@
package org.session.libsignal.streams;
import org.session.libsignal.service.internal.util.Util;
import org.session.libsignal.utilities.Util;
import java.io.IOException;
import java.io.OutputStream;

5
libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java → libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStreamFactory.java
View File

@@ -1,7 +1,4 @@
package org.session.libsignal.service.internal.push.http;
import org.session.libsignal.streams.AttachmentCipherOutputStream;
import org.session.libsignal.streams.DigestingOutputStream;
package org.session.libsignal.streams;
import java.io.IOException;
import java.io.OutputStream;

2
libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java
View File

@@ -1,6 +1,6 @@
package org.session.libsignal.streams;
import org.session.libsignal.service.internal.util.Util;
import org.session.libsignal.utilities.Util;
import java.io.FilterInputStream;
import java.io.IOException;

4
libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java → libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java
View File

@@ -1,7 +1,5 @@
package org.session.libsignal.service.internal.push.http;
package org.session.libsignal.streams;
import org.session.libsignal.streams.DigestingOutputStream;
import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener;
import java.io.IOException;

6
libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java → libsignal/src/main/java/org/session/libsignal/streams/OutputStreamFactory.java
View File

@@ -1,7 +1,4 @@
package org.session.libsignal.service.internal.push.http;
import org.session.libsignal.streams.DigestingOutputStream;
package org.session.libsignal.streams;
import java.io.IOException;
import java.io.OutputStream;
@@ -9,5 +6,4 @@ import java.io.OutputStream;
public interface OutputStreamFactory {
public DigestingOutputStream createFor(OutputStream wrap) throws IOException;
}

2
libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java
View File

@@ -1,6 +1,6 @@
package org.session.libsignal.streams;
import org.session.libsignal.service.internal.util.Util;
import org.session.libsignal.utilities.Util;
import java.io.FilterInputStream;
import java.io.IOException;

1
libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt
View File

@@ -1,6 +1,5 @@
package org.session.libsignal.streams
import org.session.libsignal.service.internal.push.http.OutputStreamFactory
import java.io.OutputStream
/**

2
libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java
View File

@@ -1,6 +1,6 @@
package org.session.libsignal.streams;
import org.session.libsignal.service.internal.util.Util;
import org.session.libsignal.utilities.Util;
import java.io.FilterInputStream;
import java.io.IOException;

6
libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java → libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java
View File

@@ -1,8 +1,4 @@
package org.session.libsignal.service.internal.push.http;
import org.session.libsignal.streams.DigestingOutputStream;
import org.session.libsignal.streams.ProfileCipherOutputStream;
package org.session.libsignal.streams;
import java.io.IOException;
import java.io.OutputStream;

2
libsignal/src/main/java/org/session/libsignal/service/internal/util/Util.java → libsignal/src/main/java/org/session/libsignal/utilities/Util.java
View File

@@ -4,7 +4,7 @@
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.service.internal.util;
package org.session.libsignal.utilities;
import java.io.ByteArrayOutputStream;
import java.io.IOException;