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

clean

Browse Source
This commit is contained in:
Ryan ZHAO
2021-02-01 11:35:53 +11:00
parent 9bc360f047
commit 5cb3a79a27
84 changed files with 165 additions and 2319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
View File

@@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.type.TypeFactory;
import network.loki.messenger.R;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
import java.util.ArrayList;
@@ -40,7 +40,7 @@ public class RecentEmojiPageModel implements EmojiPageModel {
try {
CollectionType collectionType = TypeFactory.defaultInstance()
.constructCollectionType(LinkedHashSet.class, String.class);
return JsonUtils.getMapper().readValue(serialized, collectionType);
return JsonUtil.getMapper().readValue(serialized, collectionType);
} catch (IOException e) {
Log.w(TAG, e);
return new LinkedHashSet<>();
@@ -89,7 +89,7 @@ public class RecentEmojiPageModel implements EmojiPageModel {
@Override
protected Void doInBackground(Void... params) {
try {
String serialized = JsonUtils.toJson(latestRecentlyUsed);
String serialized = JsonUtil.toJsonThrows(latestRecentlyUsed);
prefs.edit()
.putString(EMOJI_LRU_PREFERENCE, serialized)
.apply();

6
app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java
View File

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
@@ -83,7 +83,7 @@ public class SignalPlace {
public @Nullable String serialize() {
try {
return JsonUtils.toJson(this);
return JsonUtil.toJsonThrows(this);
} catch (IOException e) {
Log.w(TAG, e);
return null;
@@ -91,6 +91,6 @@ public class SignalPlace {
}
public static SignalPlace deserialize(@NonNull String serialized) throws IOException {
return JsonUtils.fromJson(serialized, SignalPlace.class);
return JsonUtil.fromJson(serialized, SignalPlace.class);
}
}

6
app/src/main/java/org/thoughtcrime/securesms/crypto/AttachmentSecret.java
View File

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
@@ -81,7 +81,7 @@ public class AttachmentSecret {
public String serialize() {
try {
return JsonUtils.toJson(this);
return JsonUtil.toJsonThrows(this);
} catch (IOException e) {
throw new AssertionError(e);
}
@@ -89,7 +89,7 @@ public class AttachmentSecret {
static AttachmentSecret fromString(@NonNull String value) {
try {
return JsonUtils.fromJson(value, AttachmentSecret.class);
return JsonUtil.fromJson(value, AttachmentSecret.class);
} catch (IOException e) {
throw new AssertionError(e);
}

2
app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
View File

@@ -31,7 +31,7 @@ import org.session.libsignal.libsignal.ecc.Curve;
import org.session.libsignal.libsignal.ecc.ECKeyPair;
import org.session.libsignal.libsignal.ecc.ECPrivateKey;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import java.io.IOException;
import java.util.LinkedList;

6
app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
View File

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
@@ -174,7 +174,7 @@ public final class KeyStoreHelper {
public String serialize() {
try {
return JsonUtils.toJson(this);
return JsonUtil.toJsonThrows(this);
} catch (IOException e) {
throw new AssertionError(e);
}
@@ -182,7 +182,7 @@ public final class KeyStoreHelper {
public static SealedData fromString(@NonNull String value) {
try {
return JsonUtils.fromJson(value, SealedData.class);
return JsonUtil.fromJson(value, SealedData.class);
} catch (IOException e) {
throw new AssertionError(e);
}

2
app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java
View File

@@ -24,7 +24,7 @@ import org.session.libsignal.libsignal.ecc.Curve;
import org.session.libsignal.libsignal.ecc.ECPrivateKey;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.utilities.Hex;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
View File

@@ -30,7 +30,7 @@ import org.session.libsignal.libsignal.ecc.ECPrivateKey;
import org.session.libsignal.libsignal.ecc.ECPublicKey;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.Util;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
View File

@@ -5,7 +5,7 @@ import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;

4
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
View File

@@ -52,7 +52,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachmentAudioExtras;
import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import org.session.libsession.utilities.Util;
import org.thoughtcrime.securesms.mms.MediaStream;
@@ -679,7 +679,7 @@ public class AttachmentDatabase extends Database {
JSONArray array = new JSONArray(cursor.getString(cursor.getColumnIndexOrThrow(ATTACHMENT_JSON_ALIAS)));
for (int i=0;i<array.length();i++) {
JsonUtils.SaneJSONObject object = new JsonUtils.SaneJSONObject(array.getJSONObject(i));
JsonUtil.SaneJSONObject object = new JsonUtil.SaneJSONObject(array.getJSONObject(i));
if (!object.isNull(ROW_ID)) {
result.add(new DatabaseAttachment(new AttachmentId(object.getLong(ROW_ID), object.getLong(UNIQUE_ID)),

6
app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
View File

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.logging.Log;
import org.session.libsignal.libsignal.IdentityKey;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
import java.util.ArrayList;
@@ -132,7 +132,7 @@ public abstract class MessagingDatabase extends Database implements MmsSmsColumn
if (document == null || document.size() == 0) {
contentValues.put(column, (String)null);
} else {
contentValues.put(column, JsonUtils.toJson(document));
contentValues.put(column, JsonUtil.toJsonThrows(document));
}
database.update(getTableName(), contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
@@ -153,7 +153,7 @@ public abstract class MessagingDatabase extends Database implements MmsSmsColumn
try {
if (!TextUtils.isEmpty(document)) {
return JsonUtils.fromJson(document, clazz);
return JsonUtil.fromJson(document, clazz);
}
} catch (IOException e) {
Log.w(TAG, e);

12
app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
View File

@@ -65,7 +65,7 @@ import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.messaging.threads.recipients.RecipientFormattingException;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
@@ -83,8 +83,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.session.libsession.messaging.sending_receiving.contacts.Contact.Avatar;
public class MmsDatabase extends MessagingDatabase {
private static final String TAG = MmsDatabase.class.getSimpleName();
@@ -655,7 +653,7 @@ public class MmsDatabase extends MessagingDatabase {
if (!TextUtils.isEmpty(mismatchDocument)) {
try {
mismatches = JsonUtils.fromJson(mismatchDocument, IdentityKeyMismatchList.class).getList();
mismatches = JsonUtil.fromJson(mismatchDocument, IdentityKeyMismatchList.class).getList();
} catch (IOException e) {
Log.w(TAG, e);
}
@@ -663,7 +661,7 @@ public class MmsDatabase extends MessagingDatabase {
if (!TextUtils.isEmpty(networkDocument)) {
try {
networkFailures = JsonUtils.fromJson(networkDocument, NetworkFailureList.class).getList();
networkFailures = JsonUtil.fromJson(networkDocument, NetworkFailureList.class).getList();
} catch (IOException e) {
Log.w(TAG, e);
}
@@ -1504,7 +1502,7 @@ public class MmsDatabase extends MessagingDatabase {
private List<IdentityKeyMismatch> getMismatchedIdentities(String document) {
if (!TextUtils.isEmpty(document)) {
try {
return JsonUtils.fromJson(document, IdentityKeyMismatchList.class).getList();
return JsonUtil.fromJson(document, IdentityKeyMismatchList.class).getList();
} catch (IOException e) {
Log.w(TAG, e);
}
@@ -1516,7 +1514,7 @@ public class MmsDatabase extends MessagingDatabase {
private List<NetworkFailure> getFailures(String document) {
if (!TextUtils.isEmpty(document)) {
try {
return JsonUtils.fromJson(document, NetworkFailureList.class).getList();
return JsonUtil.fromJson(document, NetworkFailureList.class).getList();
} catch (IOException ioe) {
Log.w(TAG, ioe);
}

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

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.logging.Log;
import net.sqlcipher.database.SQLiteDatabase;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.libsignal.ecc.Curve;
import org.session.libsignal.libsignal.ecc.ECKeyPair;

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

@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.logging.Log;
import net.sqlcipher.database.SQLiteDatabase;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
import org.session.libsignal.service.internal.util.Util;

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

@@ -16,7 +16,7 @@ import org.session.libsession.utilities.color.MaterialColor;
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.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;

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

@@ -11,7 +11,7 @@ import net.sqlcipher.database.SQLiteDatabase;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.libsignal.ecc.Curve;
import org.session.libsignal.libsignal.ecc.ECKeyPair;

4
app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
@@ -960,7 +960,7 @@ public class SmsDatabase extends MessagingDatabase {
private List<IdentityKeyMismatch> getMismatches(String document) {
try {
if (!TextUtils.isEmpty(document)) {
return JsonUtils.fromJson(document, IdentityKeyMismatchList.class).getList();
return JsonUtil.fromJson(document, IdentityKeyMismatchList.class).getList();
}
} catch (IOException e) {
Log.w(TAG, e);

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

@@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.libsignal.IdentityKey;
import org.session.libsignal.libsignal.InvalidKeyException;

4
app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
View File

@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.giph.model.GiphyImage;
import org.thoughtcrime.securesms.giph.model.GiphyResponse;
import org.thoughtcrime.securesms.net.ContentProxySelector;
import org.thoughtcrime.securesms.util.AsyncLoader;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
import java.util.LinkedList;
@@ -58,7 +58,7 @@ public abstract class GiphyLoader extends AsyncLoader<List<GiphyImage>> {
throw new IOException("Unexpected code " + response);
}
GiphyResponse giphyResponse = JsonUtils.fromJson(response.body().byteStream(), GiphyResponse.class);
GiphyResponse giphyResponse = JsonUtil.fromJson(response.body().byteStream(), GiphyResponse.class);
List<GiphyImage> results = giphyResponse.getData();
if (results == null) return new LinkedList<>();

2
app/src/main/java/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
View File

@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.sms.IncomingTextMessage;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.GroupUtil;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsignal.libsignal.util.guava.Optional;

6
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java
View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import org.session.libsession.messaging.jobs.Data;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
@@ -15,7 +15,7 @@ public class JsonDataSerializer implements Data.Serializer {
@Override
public @NonNull String serialize(@NonNull Data data) {
try {
return JsonUtils.toJson(data);
return JsonUtil.toJsonThrows(data);
} catch (IOException e) {
Log.e(TAG, "Failed to serialize to JSON.", e);
throw new AssertionError(e);
@@ -25,7 +25,7 @@ public class JsonDataSerializer implements Data.Serializer {
@Override
public @NonNull Data deserialize(@NonNull String serialized) {
try {
return JsonUtils.fromJson(serialized, Data.class);
return JsonUtil.fromJson(serialized, Data.class);
} catch (IOException e) {
Log.e(TAG, "Failed to deserialize JSON.", e);
throw new AssertionError(e);

2
app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
View File

@@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mms.MmsException;
import org.thoughtcrime.securesms.util.AttachmentUtil;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.utilities.Hex;
import org.session.libsession.utilities.Util;

2
app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
View File

@@ -17,7 +17,7 @@ import org.session.libsession.messaging.threads.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.Util;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
View File

@@ -10,7 +10,7 @@ import com.annimon.stream.Stream;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;

2
app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
View File

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.database.SmsDatabase;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.thoughtcrime.securesms.sms.IncomingTextMessage;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsignal.libsignal.util.guava.Optional;

4
app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
View File

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.service.UpdateApkReadyListener;
import org.thoughtcrime.securesms.util.FileUtils;
import org.session.libsignal.utilities.Hex;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import org.session.libsession.utilities.TextSecurePreferences;
import java.io.FileInputStream;
@@ -76,7 +76,7 @@ public class UpdateApkJob extends BaseJob {
throw new IOException("Bad response: " + response.message());
}
UpdateDescriptor updateDescriptor = JsonUtils.fromJson(response.body().string(), UpdateDescriptor.class);
UpdateDescriptor updateDescriptor = JsonUtil.fromJson(response.body().string(), UpdateDescriptor.class);
byte[] digest = Hex.fromStringCondensed(updateDescriptor.getDigest());
Log.i(TAG, "Got descriptor: " + updateDescriptor);

2
app/src/main/java/org/thoughtcrime/securesms/logging/LogSecretProvider.java
View File

@@ -5,7 +5,7 @@ import android.os.Build;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.KeyStoreHelper;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.TextSecurePreferences;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt
View File

@@ -6,7 +6,7 @@ import okhttp3.*
import org.thoughtcrime.securesms.database.DatabaseFactory
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.util.JsonUtil
import org.session.libsignal.utilities.JsonUtil
import org.session.libsignal.service.loki.api.PushNotificationAPI
import org.session.libsignal.service.loki.api.onionrequests.OnionRequestAPI
import org.session.libsignal.service.loki.utilities.retryIfNeeded

2
app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt
View File

@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.api.messages.SignalServiceEnvelope
import org.session.libsignal.service.internal.util.Base64
import org.session.libsignal.utilities.Base64
import org.session.libsignal.service.loki.api.MessageWrapper
class PushNotificationService : FirebaseMessagingService() {

2
app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt
View File

@@ -15,7 +15,7 @@ import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.service.loki.api.opengroups.PublicChat
import org.session.libsignal.libsignal.loki.SessionResetStatus
import org.session.libsignal.service.internal.util.JsonUtil
import org.session.libsignal.utilities.JsonUtil
import org.session.libsignal.service.loki.database.LokiThreadDatabaseProtocol
import org.session.libsignal.service.loki.utilities.PublicKeyValidation

2
app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt
View File

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.utilities
import android.content.ContentValues
import net.sqlcipher.Cursor
import net.sqlcipher.database.SQLiteDatabase
import org.session.libsignal.service.internal.util.Base64
import org.session.libsignal.utilities.Base64
fun <T> SQLiteDatabase.get(table: String, query: String?, arguments: Array<String>?, get: (Cursor) -> T): T? {
var cursor: Cursor? = null

2
app/src/main/java/org/thoughtcrime/securesms/loki/utilities/GroupDescription.kt
View File

@@ -5,7 +5,7 @@ import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsession.utilities.Base64
import org.session.libsignal.utilities.Base64
import org.session.libsignal.service.internal.push.SignalServiceProtos
import java.util.*

2
app/src/main/java/org/thoughtcrime/securesms/loki/utilities/KeyPairUtilities.kt
View File

@@ -6,7 +6,7 @@ import com.goterl.lazycode.lazysodium.SodiumAndroid
import com.goterl.lazycode.lazysodium.utils.Key
import com.goterl.lazycode.lazysodium.utils.KeyPair
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
import org.session.libsession.utilities.Base64
import org.session.libsignal.utilities.Base64
import org.session.libsignal.utilities.Hex
import org.session.libsignal.libsignal.ecc.DjbECPrivateKey
import org.session.libsignal.libsignal.ecc.DjbECPublicKey

2
app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
View File

@@ -9,7 +9,7 @@ import org.session.libsession.messaging.sending_receiving.contacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.Base64;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext;