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

clean

Browse Source
This commit is contained in:
Ryan ZHAO
2021-02-01 10:25:19 +11:00
parent 190badd9c0
commit 9bc360f047
55 changed files with 53 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java
View File

@@ -6,10 +6,9 @@
package org.session.libsignal.libsignal;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.libsignal.ecc.Curve;
import org.session.libsignal.libsignal.ecc.ECPublicKey;
import org.session.libsignal.libsignal.util.Hex;
import org.session.libsignal.utilities.Hex;
/**
* A class for representing an identity key.

2
libsignal/src/main/java/org/session/libsignal/libsignal/loki/FallbackSessionCipher.kt
View File

@@ -1,7 +1,7 @@
package org.session.libsignal.libsignal.loki
import org.whispersystems.curve25519.Curve25519
import org.session.libsignal.libsignal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
/**

2
libsignal/src/main/java/org/session/libsignal/libsignal/util/ByteUtil.java
View File

@@ -5,6 +5,8 @@
*/
package org.session.libsignal.libsignal.util;
import org.session.libsignal.utilities.Hex;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.text.ParseException;

66
libsignal/src/main/java/org/session/libsignal/libsignal/util/Hex.java
View File

@@ -1,66 +0,0 @@
/**
* Copyright (C) 2014-2016 Open Whisper Systems
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal.util;
import java.io.IOException;
/**
* Utility for generating hex dumps.
*/
public class Hex {
private final static char[] HEX_DIGITS = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
public static String toString(byte[] bytes) {
return toString(bytes, 0, bytes.length);
}
public static String toString(byte[] bytes, int offset, int length) {
StringBuffer buf = new StringBuffer();
for (int i = 0; i < length; i++) {
appendHexChar(buf, bytes[offset + i]);
buf.append(", ");
}
return buf.toString();
}
public static String toStringCondensed(byte[] bytes) {
StringBuffer buf = new StringBuffer();
for (int i=0;i<bytes.length;i++) {
appendHexChar(buf, bytes[i]);
}
return buf.toString();
}
public static byte[] fromStringCondensed(String encoded) throws IOException {
final char[] data = encoded.toCharArray();
final int len = data.length;
if ((len & 0x01) != 0) {
throw new IOException("Odd number of characters.");
}
final byte[] out = new byte[len >> 1];
for (int i = 0, j = 0; j < len; i++) {
int f = Character.digit(data[j], 16) << 4;
j++;
f = f | Character.digit(data[j], 16);
j++;
out[i] = (byte) (f & 0xFF);
}
return out;
}
private static void appendHexChar(StringBuffer buf, int b) {
buf.append(HEX_DIGITS[(b >> 4) & 0xf]);
buf.append(HEX_DIGITS[b & 0xf]);
}
}

2
libsignal/src/main/java/org/session/libsignal/metadata/SealedSessionCipher.java
View File

@@ -31,7 +31,7 @@ import org.session.libsignal.libsignal.protocol.PreKeySignalMessage;
import org.session.libsignal.libsignal.protocol.SignalMessage;
import org.session.libsignal.libsignal.state.SignalProtocolStore;
import org.session.libsignal.libsignal.util.ByteUtil;
import org.session.libsignal.libsignal.util.Hex;
import org.session.libsignal.utilities.Hex;
import org.session.libsignal.libsignal.util.Pair;
import java.io.IOException;

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

@@ -11,10 +11,9 @@ import com.google.protobuf.ByteString;
import org.session.libsignal.libsignal.InvalidVersionException;
import org.session.libsignal.libsignal.logging.Log;
import org.session.libsignal.service.api.push.SignalServiceAddress;
import org.session.libsignal.service.internal.push.SignalServiceProtos;
import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope;
import org.session.libsignal.service.internal.util.Base64;
import org.session.libsignal.service.internal.util.Hex;
import org.session.libsignal.utilities.Hex;
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;

3
libsignal/src/main/java/org/session/libsignal/service/internal/contacts/crypto/ContactDiscoveryCipher.java
View File

@@ -9,11 +9,10 @@ import org.threeten.bp.ZonedDateTime;
import org.threeten.bp.format.DateTimeFormatter;
import org.session.libsignal.libsignal.util.ByteUtil;
import org.session.libsignal.service.api.crypto.InvalidCiphertextException;
import org.session.libsignal.service.internal.contacts.crypto.UnauthenticatedQuoteException;
import org.session.libsignal.service.internal.contacts.entities.DiscoveryRequest;
import org.session.libsignal.service.internal.contacts.entities.DiscoveryResponse;
import org.session.libsignal.service.internal.contacts.entities.RemoteAttestationResponse;
import org.session.libsignal.service.internal.util.Hex;
import org.session.libsignal.utilities.Hex;
import org.session.libsignal.service.internal.util.JsonUtil;
import org.session.libsignal.service.internal.util.Util;

2
libsignal/src/main/java/org/session/libsignal/service/internal/contacts/entities/DiscoveryRequest.java
View File

@@ -18,7 +18,7 @@ package org.session.libsignal.service.internal.contacts.entities;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.session.libsignal.service.internal.util.Hex;
import org.session.libsignal.utilities.Hex;
public class DiscoveryRequest {

2
libsignal/src/main/java/org/session/libsignal/service/internal/contacts/entities/DiscoveryResponse.java
View File

@@ -18,7 +18,7 @@ package org.session.libsignal.service.internal.contacts.entities;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.session.libsignal.service.internal.util.Hex;
import org.session.libsignal.utilities.Hex;
public class DiscoveryResponse {

16
libsignal/src/main/java/org/session/libsignal/service/internal/push/PushServiceSocket.java
View File

@@ -42,27 +42,13 @@ import org.session.libsignal.service.internal.contacts.entities.DiscoveryRequest
import org.session.libsignal.service.internal.contacts.entities.DiscoveryResponse;
import org.session.libsignal.service.internal.contacts.entities.RemoteAttestationRequest;
import org.session.libsignal.service.internal.contacts.entities.RemoteAttestationResponse;
import org.session.libsignal.service.internal.push.AttachmentUploadAttributes;
import org.session.libsignal.service.internal.push.ContactDiscoveryCredentials;
import org.session.libsignal.service.internal.push.ContactDiscoveryFailureReason;
import org.session.libsignal.service.internal.push.ContactTokenDetailsList;
import org.session.libsignal.service.internal.push.DeviceLimitExceededException;
import org.session.libsignal.service.internal.push.OutgoingPushMessageList;
import org.session.libsignal.service.internal.push.PreKeyResponseItem;
import org.session.libsignal.service.internal.push.ProfileAvatarUploadAttributes;
import org.session.libsignal.service.internal.push.ProvisioningMessage;
import org.session.libsignal.service.internal.push.PushAttachmentData;
import org.session.libsignal.service.internal.push.SendMessageResponse;
import org.session.libsignal.service.internal.push.SenderCertificate;
import org.session.libsignal.service.internal.push.SignalServiceEnvelopeEntity;
import org.session.libsignal.service.internal.push.SignalServiceEnvelopeEntityList;
import org.session.libsignal.service.internal.push.exceptions.MismatchedDevicesException;
import org.session.libsignal.service.internal.push.exceptions.StaleDevicesException;
import org.session.libsignal.service.internal.push.http.DigestingRequestBody;
import org.session.libsignal.service.internal.push.http.OutputStreamFactory;
import org.session.libsignal.service.internal.util.Base64;
import org.session.libsignal.service.internal.util.BlacklistingTrustManager;
import org.session.libsignal.service.internal.util.Hex;
import org.session.libsignal.utilities.Hex;
import org.session.libsignal.service.internal.util.JsonUtil;
import org.session.libsignal.service.internal.util.Util;

3
libsignal/src/main/java/org/session/libsignal/service/loki/api/DotNetAPI.kt
View File

@@ -1,6 +1,5 @@
package org.session.libsignal.service.loki.api
import com.fasterxml.jackson.databind.JsonNode
import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.functional.bind
import nl.komponents.kovenant.functional.map
@@ -20,7 +19,7 @@ import org.session.libsignal.service.internal.push.PushAttachmentData
import org.session.libsignal.service.internal.push.http.DigestingRequestBody
import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory
import org.session.libsignal.service.internal.util.Base64
import org.session.libsignal.service.internal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.internal.util.JsonUtil
import org.session.libsignal.service.loki.api.fileserver.FileServerAPI
import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI

4
libsignal/src/main/java/org/session/libsignal/service/loki/api/fileserver/FileServerAPI.kt
View File

@@ -1,14 +1,11 @@
package org.session.libsignal.service.loki.api.fileserver
import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.functional.bind
import nl.komponents.kovenant.functional.map
import okhttp3.Request
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.libsignal.util.Hex
import org.session.libsignal.service.internal.util.Base64
import org.session.libsignal.service.internal.util.JsonUtil
import org.session.libsignal.service.loki.api.SnodeAPI
import org.session.libsignal.service.loki.api.LokiDotNetAPI
import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI
import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol
@@ -16,7 +13,6 @@ import org.session.libsignal.service.loki.protocol.shelved.multidevice.DeviceLin
import org.session.libsignal.service.loki.utilities.*
import java.net.URL
import java.util.concurrent.ConcurrentHashMap
import kotlin.collections.set
class FileServerAPI(public val server: String, userPublicKey: String, userPrivateKey: ByteArray, private val database: LokiAPIDatabaseProtocol) : LokiDotNetAPI(userPublicKey, userPrivateKey, database) {

2
libsignal/src/main/java/org/session/libsignal/service/loki/api/opengroups/PublicChatAPI.kt
View File

@@ -7,7 +7,7 @@ import nl.komponents.kovenant.functional.map
import nl.komponents.kovenant.then
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.util.Base64
import org.session.libsignal.service.internal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.internal.util.JsonUtil
import org.session.libsignal.service.loki.api.LokiDotNetAPI
import org.session.libsignal.service.loki.api.SnodeAPI

2
libsignal/src/main/java/org/session/libsignal/service/loki/api/opengroups/PublicChatMessage.kt
View File

@@ -2,7 +2,7 @@ package org.session.libsignal.service.loki.api.opengroups
import org.whispersystems.curve25519.Curve25519
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
public data class PublicChatMessage(

2
libsignal/src/main/java/org/session/libsignal/service/loki/api/utilities/EncryptionUtilities.kt
View File

@@ -2,7 +2,7 @@ package org.session.libsignal.service.loki.api.utilities
import org.whispersystems.curve25519.Curve25519
import org.session.libsignal.libsignal.util.ByteUtil
import org.session.libsignal.libsignal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.internal.util.Util
import javax.crypto.Cipher
import javax.crypto.Mac

3
libsignal/src/main/java/org/session/libsignal/service/loki/protocol/closedgroups/ClosedGroupSenderKey.kt
View File

@@ -2,8 +2,7 @@ package org.session.libsignal.service.loki.protocol.closedgroups
import com.google.protobuf.ByteString
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.libsignal.protocol.SignalProtos
import org.session.libsignal.libsignal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.internal.push.SignalServiceProtos
import org.session.libsignal.service.internal.util.JsonUtil
import org.session.libsignal.service.loki.utilities.toHexString

2
libsignal/src/main/java/org/session/libsignal/service/loki/protocol/closedgroups/ClosedGroupUtilities.kt
View File

@@ -3,7 +3,7 @@ package org.session.libsignal.service.loki.protocol.closedgroups
import com.google.protobuf.ByteString
import org.whispersystems.curve25519.Curve25519
import org.session.libsignal.libsignal.loki.ClosedGroupCiphertextMessage
import org.session.libsignal.libsignal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.libsignal.util.Pair
import org.session.libsignal.service.api.messages.SignalServiceEnvelope
import org.session.libsignal.service.internal.push.SignalServiceProtos

2
libsignal/src/main/java/org/session/libsignal/service/loki/protocol/closedgroups/SharedSenderKeysImplementation.kt
View File

@@ -5,7 +5,7 @@ import org.session.libsignal.libsignal.ecc.DjbECPublicKey
import org.session.libsignal.libsignal.ecc.ECKeyPair
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.libsignal.util.ByteUtil
import org.session.libsignal.libsignal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.internal.util.Util
import org.session.libsignal.service.loki.api.utilities.EncryptionUtilities
import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded

2
libsignal/src/main/java/org/session/libsignal/service/loki/protocol/shelved/multidevice/DeviceLink.kt
View File

@@ -3,7 +3,7 @@ package org.session.libsignal.service.loki.protocol.shelved.multidevice
import org.whispersystems.curve25519.Curve25519
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.util.Base64
import org.session.libsignal.service.internal.util.Hex
import org.session.libsignal.utilities.Hex
import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
import java.util.*

2
libsignal/src/main/java/org/session/libsignal/service/loki/utilities/Trimming.kt
View File

@@ -1,6 +1,6 @@
package org.session.libsignal.service.loki.utilities
import org.session.libsignal.service.internal.util.Hex
import org.session.libsignal.utilities.Hex
fun String.removing05PrefixIfNeeded(): String {
return if (length == 66) removePrefix("05") else this

18
libsignal/src/main/java/org/session/libsignal/service/internal/util/Hex.java → libsignal/src/main/java/org/session/libsignal/utilities/Hex.java
View File

@@ -1,10 +1,20 @@
/**
* Copyright (C) 2014-2016 Open Whisper Systems
* Copyright (C) 2011 Whisper Systems
*
* Licensed according to the LICENSE file in this repository.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.session.libsignal.service.internal.util;
package org.session.libsignal.utilities;
import java.io.IOException;