TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
View File

@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.session.libsignal.utilities.Base64; import org.session.libsignal.utilities.Base64;
import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceEnvelope; import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
import org.session.libsignal.service.internal.util.Util; import org.session.libsignal.utilities.Util;
import java.io.IOException; import java.io.IOException;

4
app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt
View File

@ -8,8 +8,8 @@ import org.session.libsignal.crypto.ecc.DjbECPrivateKey
import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.api.messages.SignalServiceGroup
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage import org.session.libsignal.protos.SignalServiceProtos.DataMessage
import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.removing05PrefixIfNeeded
import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.toHexString
import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.DatabaseFactory

2
app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
View File

@ -44,7 +44,7 @@ import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.ServiceUtil;
import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsignal.service.internal.util.Util; import org.session.libsignal.utilities.Util;
import org.session.libsignal.utilities.Log; import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.contactshare.ContactUtil;

6
libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
View File

@ -17,9 +17,9 @@ import org.session.libsignal.streams.AttachmentCipherOutputStream
import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream
import org.session.libsignal.streams.PaddingInputStream import org.session.libsignal.streams.PaddingInputStream
import org.session.libsignal.service.internal.push.PushAttachmentData import org.session.libsignal.service.internal.push.PushAttachmentData
import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputStreamFactory import org.session.libsignal.streams.AttachmentCipherOutputStreamFactory
import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.streams.DigestingRequestBody
import org.session.libsignal.service.internal.util.Util import org.session.libsignal.utilities.Util
import org.session.libsignal.streams.PlaintextOutputStreamFactory import org.session.libsignal.streams.PlaintextOutputStreamFactory
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log

2
libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt
View File

@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages
import com.google.protobuf.ByteString import com.google.protobuf.ByteString
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
abstract class Message { abstract class Message {
var id: Long? = null var id: Long? = null

4
libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
View File

@ -8,8 +8,8 @@ import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPrivateKey
import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage import org.session.libsignal.protos.SignalServiceProtos.DataMessage
import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.removing05PrefixIfNeeded
import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.toHexString
import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Hex

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt
View File

@ -9,7 +9,7 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil
import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPrivateKey
import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.removing05PrefixIfNeeded
import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.toHexString
import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Hex

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt
View File

@ -1,6 +1,6 @@
package org.session.libsession.messaging.messages.control package org.session.libsession.messaging.messages.control
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
class DataExtractionNotification() : ControlMessage() { class DataExtractionNotification() : ControlMessage() {

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt
View File

@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.control
import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.messages.visible.VisibleMessage
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
class ExpirationTimerUpdate() : ControlMessage() { class ExpirationTimerUpdate() : ControlMessage() {
/** In the case of a sync message, the public key of the person the message was targeted at. /** In the case of a sync message, the public key of the person the message was targeted at.

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt
View File

@ -1,6 +1,6 @@
package org.session.libsession.messaging.messages.control package org.session.libsession.messaging.messages.control
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
class ReadReceipt() : ControlMessage() { class ReadReceipt() : ControlMessage() {

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt
View File

@ -1,6 +1,6 @@
package org.session.libsession.messaging.messages.control package org.session.libsession.messaging.messages.control
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
class TypingIndicator() : ControlMessage() { class TypingIndicator() : ControlMessage() {

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt
View File

@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment
import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import java.io.File import java.io.File
class Attachment { class Attachment {

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt
View File

@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.visible
import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreiview import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreiview
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
class LinkPreview() { class LinkPreview() {
var title: String? = null var title: String? = null

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt
View File

@ -1,6 +1,6 @@
package org.session.libsession.messaging.messages.visible package org.session.libsession.messaging.messages.visible
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
class OpenGroupInvitation() { class OpenGroupInvitation() {

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt
View File

@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.visible
import com.google.protobuf.ByteString import com.google.protobuf.ByteString
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
class Profile() { class Profile() {
var displayName: String? = null var displayName: String? = null

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt
View File

@ -5,7 +5,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as SignalQuote import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as SignalQuote
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
class Quote() { class Quote() {
var timestamp: Long? = 0 var timestamp: Long? = 0

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
View File

@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment

2
libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt
View File

@ -2,7 +2,7 @@ package org.session.libsession.messaging.open_groups
import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.PushTransportDetails
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64
import org.session.libsignal.utilities.Base64.decode import org.session.libsignal.utilities.Base64.decode
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt
View File

@ -6,7 +6,7 @@ import org.session.libsession.messaging.messages.control.*
import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.messages.visible.VisibleMessage
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.PushTransportDetails
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
object MessageReceiver { object MessageReceiver {

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
View File

@ -22,7 +22,7 @@ import org.session.libsession.snode.SnodeMessage
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsession.utilities.SSKEnvironment import org.session.libsession.utilities.SSKEnvironment
import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.PushTransportDetails
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.hexEncodedPublicKey
import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt
View File

@ -16,7 +16,7 @@ import org.session.libsignal.crypto.ecc.Curve
import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.api.messages.SignalServiceGroup
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.hexEncodedPublicKey
import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.removing05PrefixIfNeeded
import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Hex

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View File

@ -25,7 +25,7 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.api.messages.SignalServiceGroup
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.removing05PrefixIfNeeded
import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.toHexString
import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java
View File

@ -9,7 +9,7 @@ import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceAttachment; import org.session.libsignal.service.api.messages.SignalServiceAttachment;
import org.session.libsignal.service.api.messages.SignalServiceDataMessage; import org.session.libsignal.service.api.messages.SignalServiceDataMessage;
import org.session.libsignal.utilities.Base64; import org.session.libsignal.utilities.Base64;
import org.session.libsignal.service.internal.push.SignalServiceProtos; import org.session.libsignal.protos.SignalServiceProtos;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt
View File

@ -8,7 +8,7 @@ package org.session.libsession.messaging.sending_receiving.attachments
import android.util.Size import android.util.Size
import com.google.protobuf.ByteString import com.google.protobuf.ByteString
import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment
import java.io.InputStream import java.io.InputStream
import kotlin.math.round import kotlin.math.round

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt
View File

@ -2,8 +2,6 @@ package org.session.libsession.messaging.sending_receiving.notifications
import android.content.Context import android.content.Context
import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsignal.service.api.messages.SignalServiceGroup
import org.session.libsignal.service.internal.push.SignalServiceProtos
interface MessageNotifier { interface MessageNotifier {
fun setVisibleThread(threadId: Long) fun setVisibleThread(threadId: Long)

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
View File

@ -11,7 +11,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupAPI
import org.session.libsession.messaging.open_groups.OpenGroupMessage import org.session.libsession.messaging.open_groups.OpenGroupMessage
import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.service.internal.push.SignalServiceProtos.* import org.session.libsignal.protos.SignalServiceProtos.*
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.utilities.successBackground import org.session.libsignal.utilities.successBackground
import java.util.* import java.util.*

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt
View File

@ -9,7 +9,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupMessageV2
import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.messaging.open_groups.OpenGroupV2
import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.utilities.successBackground import org.session.libsignal.utilities.successBackground
import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.ScheduledExecutorService

2
libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt
View File

@ -8,7 +8,7 @@ import androidx.annotation.VisibleForTesting
import org.session.libsession.utilities.DelimiterUtil import org.session.libsession.utilities.DelimiterUtil
import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.internal.util.Util import org.session.libsignal.utilities.Util
import java.util.* import java.util.*
import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.atomic.AtomicReference
import java.util.regex.Matcher import java.util.regex.Matcher

7
libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt
View File

@ -17,13 +17,12 @@ import org.session.libsignal.service.api.push.exceptions.PushNetworkException
import org.session.libsignal.service.api.util.StreamDetails import org.session.libsignal.service.api.util.StreamDetails
import org.session.libsignal.service.internal.push.ProfileAvatarData import org.session.libsignal.service.internal.push.ProfileAvatarData
import org.session.libsignal.service.internal.push.PushAttachmentData import org.session.libsignal.service.internal.push.PushAttachmentData
import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.streams.DigestingRequestBody
import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory import org.session.libsignal.streams.ProfileCipherOutputStreamFactory
import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Hex
import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.JsonUtil
import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.HTTP
import org.session.libsignal.utilities.* import org.session.libsignal.utilities.*
import org.session.libsignal.utilities.*
import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import java.util.* import java.util.*
@ -210,7 +209,7 @@ open class DotNetAPI {
fun uploadProfilePicture(server: String, key: ByteArray, profilePicture: StreamDetails, setLastProfilePictureUpload: () -> Unit): UploadResult { fun uploadProfilePicture(server: String, key: ByteArray, profilePicture: StreamDetails, setLastProfilePictureUpload: () -> Unit): UploadResult {
val profilePictureUploadData = ProfileAvatarData(profilePicture.stream, ProfileCipherOutputStream.getCiphertextLength(profilePicture.length), profilePicture.contentType, ProfileCipherOutputStreamFactory(key)) val profilePictureUploadData = ProfileAvatarData(profilePicture.stream, ProfileCipherOutputStream.getCiphertextLength(profilePicture.length), profilePicture.contentType, ProfileCipherOutputStreamFactory(key))
val file = DigestingRequestBody(profilePictureUploadData.data, profilePictureUploadData.outputStreamFactory, val file = DigestingRequestBody(profilePictureUploadData.data, profilePictureUploadData.outputStreamFactory,
profilePictureUploadData.contentType, profilePictureUploadData.dataLength, null) profilePictureUploadData.contentType, profilePictureUploadData.dataLength, null)
val body = MultipartBody.Builder() val body = MultipartBody.Builder()
.setType(MultipartBody.FORM) .setType(MultipartBody.FORM)
.addFormDataPart("type", "network.loki") .addFormDataPart("type", "network.loki")

2
libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt
View File

@ -2,7 +2,7 @@ package org.session.libsession.messaging.utilities
import com.google.protobuf.ByteString import com.google.protobuf.ByteString
import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope import org.session.libsignal.protos.SignalServiceProtos.Envelope
import org.session.libsignal.protos.WebSocketProtos.WebSocketMessage import org.session.libsignal.protos.WebSocketProtos.WebSocketMessage
import org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage import org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage
import java.security.SecureRandom import java.security.SecureRandom

2
libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
View File

@ -8,7 +8,7 @@ import nl.komponents.kovenant.functional.bind
import nl.komponents.kovenant.functional.map import nl.komponents.kovenant.functional.map
import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.messaging.utilities.MessageWrapper
import org.session.libsession.snode.utilities.getRandomElement import org.session.libsession.snode.utilities.getRandomElement
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.service.loki.Snode import org.session.libsignal.service.loki.Snode
import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.HTTP
import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol

2
libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt
View File

@ -2,7 +2,7 @@ package org.session.libsession.utilities
import androidx.annotation.WorkerThread import androidx.annotation.WorkerThread
import org.session.libsignal.utilities.ByteUtil import org.session.libsignal.utilities.ByteUtil
import org.session.libsignal.service.internal.util.Util import org.session.libsignal.utilities.Util
import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Hex
import org.whispersystems.curve25519.Curve25519 import org.whispersystems.curve25519.Curve25519
import javax.crypto.Cipher import javax.crypto.Cipher

4
libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt
View File

@ -8,8 +8,8 @@ import org.session.libsession.messaging.file_server.FileServerAPIV2
import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsession.utilities.preferences.ProfileKeyUtil
import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.streams.ProfileCipherOutputStream
import org.session.libsignal.service.internal.push.ProfileAvatarData import org.session.libsignal.service.internal.push.ProfileAvatarData
import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.streams.DigestingRequestBody
import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory import org.session.libsignal.streams.ProfileCipherOutputStreamFactory
import org.session.libsignal.utilities.retryIfNeeded import org.session.libsignal.utilities.retryIfNeeded
import org.session.libsignal.utilities.ThreadUtils import org.session.libsignal.utilities.ThreadUtils
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream

1
libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt
View File

@ -5,7 +5,6 @@ import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier
import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsignal.service.internal.push.SignalServiceProtos
class SSKEnvironment( class SSKEnvironment(
val typingIndicators: TypingIndicatorsProtocol, val typingIndicators: TypingIndicatorsProtocol,

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

@ -1,7 +1,7 @@
package org.session.libsignal.crypto package org.session.libsignal.crypto
import org.whispersystems.curve25519.Curve25519 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.Cipher
import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.IvParameterSpec
import javax.crypto.spec.SecretKeySpec 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; package org.session.libsignal.service.api.messages;
import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.internal.push.SignalServiceProtos; import org.session.libsignal.protos.SignalServiceProtos;
public class SignalServiceContent { public class SignalServiceContent {
private final String sender; 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.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.shared.SharedContact; import org.session.libsignal.service.api.messages.shared.SharedContact;
import org.session.libsignal.service.api.push.SignalServiceAddress; 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.LinkedList;
import java.util.List; 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 com.google.protobuf.ByteString;
import org.session.libsignal.service.api.push.SignalServiceAddress; 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. * 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; 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; 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; package org.session.libsignal.service.internal.push;
import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; 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; 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.InvalidMacException;
import org.session.libsignal.exceptions.InvalidMessageException; 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.File;
import java.io.FileInputStream; 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; 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.IOException;
import java.io.OutputStream; 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; package org.session.libsignal.streams;
import org.session.libsignal.streams.AttachmentCipherOutputStream;
import org.session.libsignal.streams.DigestingOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; 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; 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.FilterInputStream;
import java.io.IOException; 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 org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener;
import java.io.IOException; 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; package org.session.libsignal.streams;
import org.session.libsignal.streams.DigestingOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -9,5 +6,4 @@ import java.io.OutputStream;
public interface OutputStreamFactory { public interface OutputStreamFactory {
public DigestingOutputStream createFor(OutputStream wrap) throws IOException; 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; 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.FilterInputStream;
import java.io.IOException; 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 package org.session.libsignal.streams
import org.session.libsignal.service.internal.push.http.OutputStreamFactory
import java.io.OutputStream 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; 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.FilterInputStream;
import java.io.IOException; 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; package org.session.libsignal.streams;
import org.session.libsignal.streams.DigestingOutputStream;
import org.session.libsignal.streams.ProfileCipherOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; 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. * 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.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;