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

Move files

Browse Source
This commit is contained in:
Niels Andriesse
2021-05-18 09:12:33 +10:00
parent 77f0a54aec
commit a88322a033
204 changed files with 228 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsignal/src/main/AndroidManifest.xml
View File

@@ -1,5 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.session.libsignal">
</manifest>
<manifest package="org.session.libsignal" />

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

@@ -8,26 +8,8 @@ package org.session.libsignal.service.api.messages;
import com.google.protobuf.ByteString;
import org.session.libsignal.libsignal.InvalidVersionException;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.service.api.push.SignalServiceAddress;
import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.utilities.Hex;
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.Mac;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
/**
* This class represents an encrypted Signal Service envelope.

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

@@ -7,7 +7,7 @@
package org.session.libsignal.service.internal.push;
import org.session.libsignal.utilities.logging.Log;
import org.session.libsignal.utilities.Log;
public class PushTransportDetails {

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

@@ -1,7 +1,7 @@
package org.session.libsignal.service.loki
import okhttp3.*
import org.session.libsignal.utilities.logging.Log
import org.session.libsignal.utilities.Log
import org.session.libsignal.utilities.JsonUtil
import java.lang.IllegalStateException
import java.security.SecureRandom

2
libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt → libsignal/src/main/java/org/session/libsignal/utilities/ExternalStorageUtil.kt
View File

@@ -1,4 +1,4 @@
package org.session.libsignal.utilities.externalstorage
package org.session.libsignal.utilities
import android.content.Context
import android.net.Uri

10
libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java
View File

@@ -1,24 +1,14 @@
package org.session.libsignal.utilities;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.ResolvedType;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.SerializerProvider;
import org.json.JSONException;
import org.json.JSONObject;
import org.session.libsignal.libsignal.IdentityKey;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.utilities.logging.Log;
import java.io.IOException;
import java.io.InputStream;

2
libsignal/src/main/java/org/session/libsignal/utilities/concurrent/ListenableFuture.java → libsignal/src/main/java/org/session/libsignal/utilities/ListenableFuture.java
View File

@@ -1,4 +1,4 @@
package org.session.libsignal.utilities.concurrent;
package org.session.libsignal.utilities;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;

2
libsignal/src/main/java/org/session/libsignal/utilities/logging/Log.java → libsignal/src/main/java/org/session/libsignal/utilities/Log.java
View File

@@ -1,4 +1,4 @@
package org.session.libsignal.utilities.logging;
package org.session.libsignal.utilities;
import androidx.annotation.MainThread;

2
libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/NoExternalStorageException.java → libsignal/src/main/java/org/session/libsignal/utilities/NoExternalStorageException.java
View File

@@ -14,7 +14,7 @@
* 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.utilities.externalstorage;
package org.session.libsignal.utilities;
public class NoExternalStorageException extends Exception {

1
libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt
View File

@@ -3,7 +3,6 @@ package org.session.libsignal.utilities
import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.deferred
import org.session.libsignal.utilities.logging.Log
import java.util.concurrent.TimeoutException
fun <V, E : Throwable> Promise<V, E>.get(defaultValue: V): V {

2
libsignal/src/main/java/org/session/libsignal/utilities/concurrent/SettableFuture.java → libsignal/src/main/java/org/session/libsignal/utilities/SettableFuture.java
View File

@@ -1,4 +1,4 @@
package org.session.libsignal.utilities.concurrent;
package org.session.libsignal.utilities;
import java.util.LinkedList;
import java.util.List;