oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Move files

This commit is contained in:
Niels Andriesse 2021-05-18 09:26:08 +10:00
parent 40d2fd25d9
commit c9ebcc580f
107 changed files with 122 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
import org.session.libsession.messaging.threads.Address;

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

@ -65,7 +65,7 @@ import org.session.libsession.messaging.threads.recipients.RecipientModifiedList
import org.thoughtcrime.securesms.util.DateUtils;
import org.session.libsession.utilities.ExpirationUtil;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.lang.ref.WeakReference;
import java.sql.Date;

2
app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
View File

@ -10,7 +10,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.*
import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.utilities.DotNetAPI
import org.session.libsession.utilities.Util
import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceAttachment
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream

2
app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
View File

@ -40,7 +40,7 @@ import org.session.libsession.utilities.ServiceUtil;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.IOException;
import java.lang.ref.WeakReference;

2
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt
View File

@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase
import org.thoughtcrime.securesms.util.BackupUtil
import org.session.libsession.utilities.Util
import org.session.libsignal.crypto.kdf.HKDFv3
import org.session.libsignal.libsignal.util.ByteUtil
import org.session.libsignal.utilities.ByteUtil
import java.io.*
import java.lang.Exception
import java.security.InvalidAlgorithmParameterException

2
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt
View File

@ -20,7 +20,7 @@ import org.session.libsession.messaging.threads.Address
import org.session.libsession.utilities.Conversions
import org.session.libsession.utilities.Util
import org.session.libsignal.crypto.kdf.HKDFv3
import org.session.libsignal.libsignal.util.ByteUtil
import org.session.libsignal.utilities.ByteUtil
import java.io.*
import java.security.InvalidAlgorithmParameterException

3
app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
View File

@ -22,12 +22,11 @@ import org.greenrobot.eventbus.ThreadMode;
import network.loki.messenger.R;
import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.events.PartProgressEvent;
import org.thoughtcrime.securesms.mms.DocumentSlide;
import org.thoughtcrime.securesms.mms.SlideClickListener;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
public class DocumentView extends FrameLayout {

2
app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
View File

@ -39,7 +39,7 @@ import org.session.libsession.utilities.ViewUtil;
import org.session.libsession.utilities.concurrent.AssertedSuccessListener;
import org.session.libsignal.utilities.ListenableFuture;
import org.session.libsignal.utilities.SettableFuture;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.util.concurrent.TimeUnit;

2
app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
View File

@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.mms.SlideClickListener;
import org.thoughtcrime.securesms.mms.SlidesClickedListener;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.ViewUtil;

2
app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
View File

@ -38,7 +38,7 @@ import android.view.ViewGroup;
import network.loki.messenger.R;
import org.thoughtcrime.securesms.util.BitmapUtil;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;

2
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
View File

@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.components.emoji;
import network.loki.messenger.R;
import org.session.libsignal.libsignal.util.Pair;
import org.session.libsignal.utilities.Pair;
import java.util.Arrays;
import java.util.LinkedList;

2
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
View File

@ -26,7 +26,7 @@ import org.session.libsignal.utilities.Log;
import org.session.libsession.utilities.FutureTaskListener;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.Pair;
import org.session.libsignal.utilities.Pair;
import java.util.List;
import java.util.concurrent.ExecutionException;

2
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
View File

@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
public class EmojiTextView extends AppCompatTextView {

2
app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java
View File

@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.shared.SharedContact;
import java.util.ArrayList;

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -112,8 +112,8 @@ import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.ViewUtil;
import org.session.libsession.utilities.concurrent.AssertedSuccessListener;
import org.session.libsession.utilities.views.Stub;
import org.session.libsignal.libsignal.InvalidMessageException;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.exceptions.InvalidMessageException;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.loki.Mention;
import org.session.libsignal.service.loki.utilities.HexEncodingKt;
import org.session.libsignal.service.loki.utilities.PublicKeyValidation;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
View File

@ -47,7 +47,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient;
import org.thoughtcrime.securesms.util.DateUtils;
import org.thoughtcrime.securesms.util.LRUCache;
import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
import org.session.libsession.utilities.Conversions;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@ -77,7 +77,7 @@ import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.ViewUtil;
import org.session.libsession.utilities.concurrent.SimpleTask;
import org.session.libsession.utilities.task.ProgressDialogAsyncTask;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.MessageDetailsActivity;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@ -70,7 +70,7 @@ import org.session.libsession.utilities.ThemeUtil;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.ViewUtil;
import org.session.libsession.utilities.views.Stub;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.BindableConversationItem;
import org.thoughtcrime.securesms.MediaPreviewActivity;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
View File

@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.util.DateUtils;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;

4
app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java
View File

@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.crypto;
import android.os.Parcel;
import android.os.Parcelable;
import org.session.libsignal.libsignal.IdentityKey;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.crypto.IdentityKey;
import org.session.libsignal.exceptions.InvalidKeyException;
public class IdentityKeyParcelable implements Parcelable {

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

@ -23,7 +23,7 @@ import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.utilities.GroupUtil;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
import org.session.libsignal.service.loki.LokiOpenGroupDatabaseProtocol;

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

@ -12,7 +12,7 @@ import org.session.libsession.database.documents.IdentityKeyMismatch;
import org.session.libsession.database.documents.IdentityKeyMismatchList;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.session.libsignal.utilities.Log;
import org.session.libsignal.libsignal.IdentityKey;
import org.session.libsignal.crypto.IdentityKey;
import org.session.libsession.messaging.threads.Address;
import org.session.libsignal.utilities.JsonUtil;

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

@ -69,7 +69,7 @@ import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
import org.session.libsignal.utilities.Log;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.Closeable;
import java.io.IOException;

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

@ -10,7 +10,7 @@ import net.sqlcipher.database.SQLiteDatabase;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.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

@ -19,7 +19,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient.*;
import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.utilities.Log;
import java.io.Closeable;

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

@ -45,7 +45,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient;
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;
import org.session.libsignal.utilities.guava.Optional;
import java.io.IOException;
import java.security.SecureRandom;

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

@ -30,8 +30,8 @@ import org.session.libsession.utilities.IdentityKeyUtil
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsession.utilities.preferences.ProfileKeyUtil
import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.libsignal.util.KeyHelper
import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.utilities.KeyHelper
import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
import org.session.libsignal.service.api.messages.SignalServiceGroup
import org.thoughtcrime.securesms.ApplicationContext

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

@ -39,8 +39,8 @@ import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSe
import org.session.libsession.utilities.DelimiterUtil;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.Pair;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.Pair;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.contactshare.ContactUtil;
import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;

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

@ -5,7 +5,7 @@ import android.database.Cursor;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.util.AbstractCursorLoader;
import org.session.libsignal.libsignal.util.Pair;
import org.session.libsignal.utilities.Pair;
public class ConversationLoader extends AbstractCursorLoader {
private final long threadId;

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

@ -17,8 +17,8 @@ import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
import org.thoughtcrime.securesms.util.BitmapDecodingException;
import org.thoughtcrime.securesms.util.BitmapUtil;
import org.session.libsignal.utilities.Hex;
import org.session.libsignal.libsignal.InvalidMessageException;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.exceptions.InvalidMessageException;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.SignalServiceMessageReceiver;
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException;

2
app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
View File

@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.net.CompositeRequestController;
import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor;
import org.thoughtcrime.securesms.net.RequestController;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.SignalServiceMessageReceiver;
import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil.OpenGraph;

2
app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
View File

@ -13,7 +13,7 @@ import android.text.util.Linkify;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.util.DateUtils;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.utilities.Util;

2
app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
View File

@ -11,7 +11,7 @@ import android.text.TextUtils;
import org.thoughtcrime.securesms.net.RequestController;
import org.session.libsession.utilities.Debouncer;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
View File

@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.launch
import network.loki.messenger.R
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.libsignal.util.KeyHelper
import org.session.libsignal.utilities.KeyHelper
import org.session.libsignal.crypto.MnemonicCodec
import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
import org.session.libsignal.utilities.Hex

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt
View File

@ -14,7 +14,7 @@ import android.widget.Toast
import kotlinx.android.synthetic.main.activity_recovery_phrase_restore.*
import network.loki.messenger.R
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.libsignal.util.KeyHelper
import org.session.libsignal.utilities.KeyHelper
import org.session.libsignal.crypto.MnemonicCodec
import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
import org.session.libsignal.utilities.Hex

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
View File

@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.activity_register.*
import network.loki.messenger.R
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.libsignal.util.KeyHelper
import org.session.libsignal.utilities.KeyHelper
import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
import org.thoughtcrime.securesms.BaseActionBarActivity
import org.session.libsession.utilities.KeyPairUtilities

2
app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
View File

@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.mms.TextSlide;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.concurrent.SignalExecutors;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.IOException;
import java.io.InputStream;

2
app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
View File

@ -12,7 +12,7 @@ import android.os.Handler;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.DatabaseContentProviders;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
class LongMessageViewModel extends ViewModel {

2
app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java
View File

@ -10,7 +10,7 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
import org.thoughtcrime.securesms.mediasend.Media;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java
View File

@ -5,7 +5,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
/**
* Represents a piece of media that the user has on their device.

4
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
View File

@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mediasend;
import androidx.appcompat.app.ActionBar;
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Point;
@ -21,7 +21,7 @@ import android.view.WindowManager;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import network.loki.messenger.R;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
View File

@ -19,7 +19,7 @@ import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.File;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
View File

@ -21,7 +21,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProvider;
import org.session.libsession.utilities.MediaTypes;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.permissions.Permissions;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
View File

@ -47,7 +47,7 @@ import org.thoughtcrime.securesms.scribbles.ImageEditorFragment;
import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
import org.thoughtcrime.securesms.util.PushCharacterCalculator;
import org.thoughtcrime.securesms.util.Stopwatch;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
View File

@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.SingleLiveEvent;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.util.Collections;
import java.util.HashMap;

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

@ -51,7 +51,7 @@ import org.thoughtcrime.securesms.providers.BlobProvider;
import org.session.libsignal.utilities.ExternalStorageUtil;
import org.thoughtcrime.securesms.util.FileProviderUtil;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.threads.recipients.Recipient;

4
app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
View File

@ -7,8 +7,8 @@ import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.data.DataFetcher;
import org.session.libsignal.utilities.Log;
import org.session.libsignal.libsignal.InvalidMessageException;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.exceptions.InvalidMessageException;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.streams.AttachmentCipherInputStream;
import java.io.File;

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

@ -10,7 +10,7 @@ import com.bumptech.glide.load.model.ModelLoaderFactory;
import com.bumptech.glide.load.model.MultiModelLoaderFactory;
import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.File;
import java.io.InputStream;

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

@ -25,7 +25,7 @@ import androidx.annotation.Nullable;
import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment;

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

@ -24,7 +24,7 @@ import com.annimon.stream.Stream;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.util.LinkedList;
import java.util.List;

2
app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java
View File

@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
import org.session.libsession.utilities.Util;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.InputStream;

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

@ -9,8 +9,8 @@ import com.bumptech.glide.util.ContentLengthInputStream;
import org.session.libsignal.utilities.Log;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.concurrent.SignalExecutors;
import org.session.libsignal.libsignal.util.Pair;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.Pair;
import org.session.libsignal.utilities.guava.Optional;
import java.io.FilterInputStream;
import java.io.IOException;

2
app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
View File

@ -11,7 +11,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.GroupUtil;
import org.session.libsession.utilities.SSKEnvironment;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceGroup;
import org.session.libsignal.utilities.Log;

2
app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
View File

@ -15,7 +15,7 @@ import androidx.core.content.ContextCompat;
import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.loki.activities.HomeActivity;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.session.libsignal.libsignal.util.guava.Preconditions;
import org.session.libsignal.utilities.guava.Preconditions;
import network.loki.messenger.R;

2
app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt
View File

@ -14,7 +14,7 @@ import androidx.fragment.app.Fragment
import network.loki.messenger.R
import org.greenrobot.eventbus.EventBus
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.libsignal.util.ByteUtil
import org.session.libsignal.utilities.ByteUtil
import org.session.libsignal.utilities.Log
import org.thoughtcrime.securesms.backup.BackupEvent
import org.thoughtcrime.securesms.backup.BackupPassphrase

2
app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java
View File

@ -9,7 +9,7 @@ import android.text.style.CharacterStyle;
import com.annimon.stream.Stream;
import org.session.libsignal.libsignal.util.Pair;
import org.session.libsignal.utilities.Pair;
import java.util.Collections;
import java.util.LinkedList;

2
app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java
View File

@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.service;
import org.junit.Before;
import org.junit.Test;
import org.thoughtcrime.securesms.BaseUnitTest;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.util.HashMap;
import java.util.Map;

2
app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java
View File

@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.util;
import org.junit.Test;
import org.session.libsignal.libsignal.util.Pair;
import org.session.libsignal.utilities.Pair;
import java.util.Arrays;
import java.util.List;

4
libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java
View File

@ -15,8 +15,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.session.libsession.messaging.threads.Address;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.libsignal.IdentityKey;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.crypto.IdentityKey;
import org.session.libsignal.exceptions.InvalidKeyException;
import java.io.IOException;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java
View File

@ -11,7 +11,7 @@ import org.session.libsession.messaging.StorageProtocol;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.utilities.Conversions;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.ByteArrayInputStream;
import java.io.IOException;

2
libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java
View File

@ -9,7 +9,7 @@ import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.utilities.GroupUtil;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceAttachment;
import org.session.libsignal.service.api.messages.SignalServiceGroup;

2
libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java
View File

@ -10,7 +10,7 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.utilities.UpdateMessageData;
import org.session.libsession.utilities.GroupUtil;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceGroup;
public class IncomingTextMessage implements Parcelable {

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

@ -5,7 +5,7 @@ import android.webkit.MimeTypeMap
import com.google.protobuf.ByteString
import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment
import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment
import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
import org.session.libsignal.service.internal.push.SignalServiceProtos
import java.io.File

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

@ -14,7 +14,7 @@ import org.session.libsession.utilities.GroupUtil
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.crypto.ecc.Curve
import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceGroup
import org.session.libsignal.service.internal.push.SignalServiceProtos
import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey

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

@ -23,7 +23,7 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil
import org.session.libsignal.crypto.ecc.DjbECPrivateKey
import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceGroup
import org.session.libsignal.service.internal.push.SignalServiceProtos
import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded

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

@ -5,7 +5,7 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceAttachment;
import org.session.libsignal.service.api.messages.SignalServiceDataMessage;
import org.session.libsignal.utilities.Base64;

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

@ -1,7 +1,7 @@
package org.session.libsession.messaging.sending_receiving.attachments
import com.google.protobuf.ByteString
import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.utilities.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceAttachment
import java.io.InputStream

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

@ -5,7 +5,7 @@
*/
package org.session.libsession.messaging.sending_receiving.attachments
import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.utilities.guava.Optional
/**
* Represents a received SignalServiceAttachment "handle." This

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

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

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java
View File

@ -10,7 +10,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId;
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
import org.session.libsignal.utilities.JsonUtil;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.IOException;

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

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

2
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java
View File

@ -37,7 +37,7 @@ import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.color.MaterialColor;
import org.session.libsignal.utilities.Log;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.avatars.ContactColors;
import org.session.libsession.messaging.avatars.ContactPhoto;
import org.session.libsession.messaging.avatars.GroupRecordContactPhoto;

2
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java
View File

@ -24,7 +24,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.session.libsession.messaging.MessagingModuleConfiguration;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.utilities.color.MaterialColor;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.GroupRecord;

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

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

6
libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java
View File

@ -23,9 +23,9 @@ import android.content.SharedPreferences.Editor;
import androidx.annotation.NonNull;
import org.session.libsignal.crypto.ecc.ECPublicKey;
import org.session.libsignal.libsignal.IdentityKey;
import org.session.libsignal.libsignal.IdentityKeyPair;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.crypto.IdentityKey;
import org.session.libsignal.crypto.IdentityKeyPair;
import org.session.libsignal.exceptions.InvalidKeyException;
import org.session.libsignal.crypto.ecc.Curve;
import org.session.libsignal.crypto.ecc.ECKeyPair;
import org.session.libsignal.crypto.ecc.ECPrivateKey;

4
libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java → libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java
View File

@ -3,11 +3,11 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal;
package org.session.libsignal.crypto;
import org.session.libsignal.crypto.ecc.Curve;
import org.session.libsignal.crypto.ecc.ECPublicKey;
import org.session.libsignal.exceptions.InvalidKeyException;
import org.session.libsignal.utilities.Hex;
/**

2
libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java → libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal;
package org.session.libsignal.crypto;
import org.session.libsignal.crypto.ecc.ECPrivateKey;

2
libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java
View File

@ -7,7 +7,7 @@ package org.session.libsignal.crypto.ecc;
import org.whispersystems.curve25519.Curve25519;
import org.whispersystems.curve25519.Curve25519KeyPair;
import org.session.libsignal.libsignal.InvalidKeyException;
import org.session.libsignal.exceptions.InvalidKeyException;
import static org.whispersystems.curve25519.Curve25519.BEST;
public class Curve {

2
libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java
View File

@ -6,7 +6,7 @@
package org.session.libsignal.crypto.ecc;
import org.session.libsignal.libsignal.util.ByteUtil;
import org.session.libsignal.utilities.ByteUtil;
import java.math.BigInteger;
import java.util.Arrays;

2
libsignal/src/main/java/org/session/libsignal/libsignal/InvalidKeyException.java → libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal;
package org.session.libsignal.exceptions;
public class InvalidKeyException extends Exception {

2
libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMacException.java → libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal;
package org.session.libsignal.exceptions;
public class InvalidMacException extends Exception {

2
libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMessageException.java → libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal;
package org.session.libsignal.exceptions;
public class InvalidMessageException extends Exception {

2
libsignal/src/main/java/org/session/libsignal/metadata/InvalidMetadataMessageException.java → libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java
View File

@ -1,4 +1,4 @@
package org.session.libsignal.metadata;
package org.session.libsignal.exceptions;
public class InvalidMetadataMessageException extends Exception {

2
libsignal/src/main/java/org/session/libsignal/libsignal/InvalidVersionException.java → libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal;
package org.session.libsignal.exceptions;
public class InvalidVersionException extends Exception {
public InvalidVersionException(String detailMessage) {

2
libsignal/src/main/java/org/session/libsignal/metadata/ProtocolException.java → libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java
View File

@ -1,4 +1,4 @@
package org.session.libsignal.metadata;
package org.session.libsignal.exceptions;
public abstract class ProtocolException extends Exception {

4
libsignal/src/main/java/org/session/libsignal/metadata/ProtocolInvalidMessageException.java → libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java
View File

@ -1,8 +1,6 @@
package org.session.libsignal.metadata;
package org.session.libsignal.exceptions;
import org.session.libsignal.libsignal.InvalidMessageException;
public class ProtocolInvalidMessageException extends ProtocolException {
public ProtocolInvalidMessageException(InvalidMessageException e, String sender, int senderDevice) {
super(e, sender, senderDevice);

23
libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java
View File

@ -1,23 +0,0 @@
/**
* Copyright (C) 2014-2016 Open Whisper Systems
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal.state;
import org.session.libsignal.libsignal.IdentityKeyPair;
/**
* Provides an interface to identity information.
*
* @author Moxie Marlinspike
*/
public interface IdentityKeyStore {
/**
* Get the local client's identity key pair.
*
* @return The local client's persistent identity key pair.
*/
public IdentityKeyPair getIdentityKeyPair();
}

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

@ -6,7 +6,7 @@
package org.session.libsignal.service.api;
import org.session.libsignal.libsignal.InvalidMessageException;
import org.session.libsignal.exceptions.InvalidMessageException;
import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener;
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
import org.session.libsignal.service.api.messages.SignalServiceDataMessage;

4
libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java
View File

@ -6,9 +6,7 @@
package org.session.libsignal.service.api.messages;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream;
import org.session.libsignal.utilities.guava.Optional;
import java.io.InputStream;

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

@ -6,7 +6,7 @@
package org.session.libsignal.service.api.messages;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.SignalServiceMessageReceiver;
/**

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

@ -6,7 +6,7 @@
package org.session.libsignal.service.api.messages;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import java.io.InputStream;

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

@ -6,7 +6,7 @@
package org.session.libsignal.service.api.messages;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.internal.push.SignalServiceProtos;
public class SignalServiceContent {

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

@ -6,7 +6,7 @@
package org.session.libsignal.service.api.messages;
import org.session.libsignal.libsignal.util.guava.Optional;
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;

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

@ -6,8 +6,7 @@
package org.session.libsignal.service.api.messages;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceAttachment;
import org.session.libsignal.utilities.guava.Optional;
import java.util.List;

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

@ -1,6 +1,6 @@
package org.session.libsignal.service.api.messages.shared;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsignal.service.api.messages.SignalServiceAttachment;
import java.util.LinkedList;

2
libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java
View File

@ -6,7 +6,7 @@
package org.session.libsignal.service.api.push;
import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.utilities.guava.Optional;
/**
* A class representing a message destination or origin.

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

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

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

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal.util;
package org.session.libsignal.utilities;
import org.session.libsignal.utilities.Hex;

2
libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt
View File

@ -1,6 +1,6 @@
package org.session.libsignal.service.loki.utilities
import org.session.libsignal.libsignal.IdentityKeyPair
import org.session.libsignal.crypto.IdentityKeyPair
import org.session.libsignal.crypto.ecc.ECKeyPair
fun ByteArray.toHexString(): String {

2
libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java → libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java
View File

@ -3,7 +3,7 @@
*
* Licensed according to the LICENSE file in this repository.
*/
package org.session.libsignal.libsignal.util;
package org.session.libsignal.utilities;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;

Some files were not shown because too many files have changed in this diff Show More