TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-02 14:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean

Browse Source
This commit is contained in:
Ryan ZHAO 2021-02-02 15:40:43 +11:00
parent 94913a334c
commit 1e93d4651c
40 changed files with 49 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ import com.google.firebase.iid.FirebaseInstanceId;
import org.conscrypt.Conscrypt; import org.conscrypt.Conscrypt;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.session.libsession.messaging.MessagingConfiguration; import org.session.libsession.messaging.MessagingConfiguration;
import org.session.libsession.messaging.contacts.avatars.AvatarHelper; import org.session.libsession.messaging.avatars.AvatarHelper;
import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.SSKEnvironment;
import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier; import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper; import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
@ -42,7 +42,6 @@ import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util; import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.dynamiclanguage.LocaleParser; import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
import org.session.libsignal.libsignal.state.SessionRecord;
import org.signal.aesgcmprovider.AesGcmProvider; import org.signal.aesgcmprovider.AesGcmProvider;
import org.thoughtcrime.securesms.loki.api.SessionProtocolImpl; import org.thoughtcrime.securesms.loki.api.SessionProtocolImpl;
import org.thoughtcrime.securesms.sskenvironment.ProfileManager; import org.thoughtcrime.securesms.sskenvironment.ProfileManager;
@ -52,7 +51,6 @@ import org.thoughtcrime.securesms.components.TypingStatusSender;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.MasterSecretUtil; import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.GroupDatabase;
@ -99,10 +97,8 @@ import org.webrtc.PeerConnectionFactory;
import org.webrtc.PeerConnectionFactory.InitializationOptions; import org.webrtc.PeerConnectionFactory.InitializationOptions;
import org.webrtc.voiceengine.WebRtcAudioManager; import org.webrtc.voiceengine.WebRtcAudioManager;
import org.webrtc.voiceengine.WebRtcAudioUtils; import org.webrtc.voiceengine.WebRtcAudioUtils;
import org.session.libsignal.libsignal.SignalProtocolAddress;
import org.session.libsignal.libsignal.logging.SignalProtocolLoggerProvider; import org.session.libsignal.libsignal.logging.SignalProtocolLoggerProvider;
import org.session.libsignal.service.api.messages.SignalServiceEnvelope; import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
import org.session.libsignal.service.api.push.SignalServiceAddress;
import org.session.libsignal.service.api.util.StreamDetails; import org.session.libsignal.service.api.util.StreamDetails;
import org.session.libsignal.service.internal.push.SignalServiceProtos; import org.session.libsignal.service.internal.push.SignalServiceProtos;
import org.session.libsignal.service.loki.api.Poller; import org.session.libsignal.service.loki.api.Poller;

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

@ -2,7 +2,6 @@ package org.thoughtcrime.securesms;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import android.view.View;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
@ -11,12 +10,10 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator; import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator;
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.linkpreview.LinkPreview;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;

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

@ -12,7 +12,7 @@ import net.sqlcipher.database.SQLiteDatabase
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
import org.session.libsession.messaging.contacts.avatars.AvatarHelper import org.session.libsession.messaging.avatars.AvatarHelper
import org.session.libsession.utilities.Conversions import org.session.libsession.utilities.Conversions
import org.thoughtcrime.securesms.backup.BackupProtos.* import org.thoughtcrime.securesms.backup.BackupProtos.*

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

@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.*
import org.thoughtcrime.securesms.logging.Log import org.thoughtcrime.securesms.logging.Log
import org.thoughtcrime.securesms.util.BackupUtil import org.thoughtcrime.securesms.util.BackupUtil
import org.session.libsession.messaging.contacts.avatars.AvatarHelper import org.session.libsession.messaging.avatars.AvatarHelper
import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address
import org.session.libsession.utilities.Conversions import org.session.libsession.utilities.Conversions

7
app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
View File

@ -6,7 +6,6 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Outline; import android.graphics.Outline;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -24,9 +23,9 @@ import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.GlideRequests;
import org.session.libsession.messaging.contacts.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactColors;
import org.session.libsession.messaging.contacts.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.ContactPhoto;
import org.session.libsession.messaging.contacts.avatars.ResourceContactPhoto; import org.session.libsession.messaging.avatars.ResourceContactPhoto;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.messaging.threads.recipients.RecipientExporter; import org.session.libsession.messaging.threads.recipients.RecipientExporter;

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

@ -11,8 +11,8 @@ import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import static org.session.libsession.messaging.sending_receiving.contacts.Contact.*; import static org.session.libsession.messaging.sending_receiving.sharecontacts.Contact.*;
public class ContactModelMapper { public class ContactModelMapper {

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

@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.thoughtcrime.securesms.components.emoji.EmojiStrings; import org.thoughtcrime.securesms.components.emoji.EmojiStrings;
import org.thoughtcrime.securesms.util.SpanUtil; import org.thoughtcrime.securesms.util.SpanUtil;

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

@ -196,7 +196,7 @@ import org.thoughtcrime.securesms.util.PushCharacterCalculator;
import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.ServiceUtil;
import org.session.libsession.utilities.Util; import org.session.libsession.utilities.Util;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator; import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator;

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

@ -59,7 +59,7 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment; 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.AttachmentId;
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;

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

@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.mms.SlideDeck; import org.thoughtcrime.securesms.mms.SlideDeck;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.threads.GroupRecord; import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;

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

@ -22,7 +22,7 @@ import androidx.annotation.Nullable;
import android.text.SpannableString; import android.text.SpannableString;
import network.loki.messenger.R; import network.loki.messenger.R;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.SmsDatabase.Status; import org.thoughtcrime.securesms.database.SmsDatabase.Status;

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

@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.database.model;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;

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

@ -8,7 +8,7 @@ import com.bumptech.glide.Priority;
import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.data.DataFetcher; import com.bumptech.glide.load.data.DataFetcher;
import org.session.libsession.messaging.contacts.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.ContactPhoto;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

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

@ -9,7 +9,7 @@ import com.bumptech.glide.load.model.ModelLoader;
import com.bumptech.glide.load.model.ModelLoaderFactory; import com.bumptech.glide.load.model.ModelLoaderFactory;
import com.bumptech.glide.load.model.MultiModelLoaderFactory; import com.bumptech.glide.load.model.MultiModelLoaderFactory;
import org.session.libsession.messaging.contacts.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.ContactPhoto;
import java.io.InputStream; import java.io.InputStream;

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

@ -36,7 +36,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment; import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment;
import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment; import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator; import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;

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

@ -9,7 +9,7 @@ import android.text.TextUtils;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.utilities.MediaTypes; import org.session.libsession.utilities.MediaTypes;
import org.session.libsignal.utilities.Base64; import org.session.libsignal.utilities.Base64;
import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.TextSecurePreferences;

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

@ -8,7 +8,7 @@ import android.text.TextUtils;
import org.session.libsession.messaging.jobs.Data; import org.session.libsession.messaging.jobs.Data;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.messaging.contacts.avatars.AvatarHelper; import org.session.libsession.messaging.avatars.AvatarHelper;
import org.session.libsession.utilities.Util; import org.session.libsession.utilities.Util;
import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.Job;

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

@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.loki.utilities.push
import org.thoughtcrime.securesms.mms.GlideApp import org.thoughtcrime.securesms.mms.GlideApp
import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.mms.GlideRequests
import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.permissions.Permissions
import org.session.libsession.messaging.contacts.avatars.AvatarHelper import org.session.libsession.messaging.avatars.AvatarHelper
import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints
import org.thoughtcrime.securesms.util.BitmapDecodingException import org.thoughtcrime.securesms.util.BitmapDecodingException
import org.thoughtcrime.securesms.util.BitmapUtil import org.thoughtcrime.securesms.util.BitmapUtil

2
app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
View File

@ -10,7 +10,7 @@ import androidx.annotation.DimenRes
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import kotlinx.android.synthetic.main.view_profile_picture.view.* import kotlinx.android.synthetic.main.view_profile_picture.view.*
import network.loki.messenger.R import network.loki.messenger.R
import org.session.libsession.messaging.contacts.avatars.ProfileContactPhoto import org.session.libsession.messaging.avatars.ProfileContactPhoto
import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address
import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator

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

@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment; import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;

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

@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;

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

@ -7,7 +7,7 @@ import android.text.TextUtils;
import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
import org.thoughtcrime.securesms.database.documents.NetworkFailure; import org.thoughtcrime.securesms.database.documents.NetworkFailure;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;

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

@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview; import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient;

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

@ -20,7 +20,7 @@ import com.bumptech.glide.load.resource.gif.GifDrawable;
import com.bumptech.glide.load.resource.gif.StreamGifDecoder; import com.bumptech.glide.load.resource.gif.StreamGifDecoder;
import com.bumptech.glide.module.AppGlideModule; import com.bumptech.glide.module.AppGlideModule;
import org.session.libsession.messaging.contacts.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.ContactPhoto;
import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.AttachmentSecret;
import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl; import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl;

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

@ -40,7 +40,7 @@ import android.text.TextUtils;
import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier; import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ApplicationContext;
import org.session.libsession.messaging.sending_receiving.contacts.Contact; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.contactshare.ContactUtil;
import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.thoughtcrime.securesms.conversation.ConversationActivity;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;

6
app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
View File

@ -25,9 +25,9 @@ import androidx.core.app.RemoteInput;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import org.session.libsession.messaging.contacts.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactColors;
import org.session.libsession.messaging.contacts.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.ContactPhoto;
import org.session.libsession.messaging.contacts.avatars.GeneratedContactPhoto; import org.session.libsession.messaging.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator; import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities; import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/AvatarHelper.java → libsession/src/main/java/org/session/libsession/messaging/avatars/AvatarHelper.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ContactColors.java → libsession/src/main/java/org/session/libsession/messaging/avatars/ContactColors.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ContactColorsLegacy.java → libsession/src/main/java/org/session/libsession/messaging/avatars/ContactColorsLegacy.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ContactPhoto.java → libsession/src/main/java/org/session/libsession/messaging/avatars/ContactPhoto.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/FallbackContactPhoto.java → libsession/src/main/java/org/session/libsession/messaging/avatars/FallbackContactPhoto.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/GeneratedContactPhoto.java → libsession/src/main/java/org/session/libsession/messaging/avatars/GeneratedContactPhoto.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;

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

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ProfileContactPhoto.java → libsession/src/main/java/org/session/libsession/messaging/avatars/ProfileContactPhoto.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;

3
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ResourceContactPhoto.java → libsession/src/main/java/org/session/libsession/messaging/avatars/ResourceContactPhoto.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
@ -8,7 +8,6 @@ import android.graphics.drawable.LayerDrawable;
import android.widget.ImageView; import android.widget.ImageView;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.appcompat.content.res.AppCompatResources;
import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.TextDrawable;
import com.makeramen.roundedimageview.RoundedDrawable; import com.makeramen.roundedimageview.RoundedDrawable;

2
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/SystemContactPhoto.java → libsession/src/main/java/org/session/libsession/messaging/avatars/SystemContactPhoto.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;

6
libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/TransparentContactPhoto.java → libsession/src/main/java/org/session/libsession/messaging/avatars/TransparentContactPhoto.java
View File

@ -1,14 +1,10 @@
package org.session.libsession.messaging.contacts.avatars; package org.session.libsession.messaging.avatars;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import androidx.core.content.ContextCompat;
import com.makeramen.roundedimageview.RoundedDrawable; import com.makeramen.roundedimageview.RoundedDrawable;
import org.session.libsession.R;
public class TransparentContactPhoto implements FallbackContactPhoto { public class TransparentContactPhoto implements FallbackContactPhoto {
public TransparentContactPhoto() {} public TransparentContactPhoto() {}

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/contacts/Contact.java → libsession/src/main/java/org/session/libsession/messaging/sending_receiving/sharecontacts/Contact.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.sending_receiving.contacts; package org.session.libsession.messaging.sending_receiving.sharecontacts;
import android.net.Uri; import android.net.Uri;
import android.os.Parcel; import android.os.Parcel;

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/contacts/Selectable.java → libsession/src/main/java/org/session/libsession/messaging/sending_receiving/sharecontacts/Selectable.java
View File

@ -1,4 +1,4 @@
package org.session.libsession.messaging.sending_receiving.contacts; package org.session.libsession.messaging.sending_receiving.sharecontacts;
public interface Selectable { public interface Selectable {
void setSelected(boolean selected); void setSelected(boolean selected);

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

@ -29,7 +29,7 @@ import com.annimon.stream.function.Consumer;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.session.libsession.messaging.MessagingConfiguration; import org.session.libsession.messaging.MessagingConfiguration;
import org.session.libsession.messaging.contacts.avatars.TransparentContactPhoto; import org.session.libsession.messaging.avatars.TransparentContactPhoto;
import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.GroupRecord; import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.messaging.threads.recipients.RecipientProvider.RecipientDetails; import org.session.libsession.messaging.threads.recipients.RecipientProvider.RecipientDetails;
@ -39,11 +39,11 @@ import org.session.libsession.utilities.color.MaterialColor;
import org.session.libsignal.libsignal.logging.Log; import org.session.libsignal.libsignal.logging.Log;
import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.libsignal.util.guava.Optional;
import org.session.libsignal.service.loki.protocol.shelved.multidevice.MultiDeviceProtocol; import org.session.libsignal.service.loki.protocol.shelved.multidevice.MultiDeviceProtocol;
import org.session.libsession.messaging.contacts.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactColors;
import org.session.libsession.messaging.contacts.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.ContactPhoto;
import org.session.libsession.messaging.contacts.avatars.GroupRecordContactPhoto; import org.session.libsession.messaging.avatars.GroupRecordContactPhoto;
import org.session.libsession.messaging.contacts.avatars.ProfileContactPhoto; import org.session.libsession.messaging.avatars.ProfileContactPhoto;
import org.session.libsession.messaging.contacts.avatars.SystemContactPhoto; import org.session.libsession.messaging.avatars.SystemContactPhoto;
import org.session.libsession.utilities.ProfilePictureModifiedEvent; import org.session.libsession.utilities.ProfilePictureModifiedEvent;
import org.session.libsession.utilities.FutureTaskListener; import org.session.libsession.utilities.FutureTaskListener;
import org.session.libsession.utilities.ListenableFutureTask; import org.session.libsession.utilities.ListenableFutureTask;
@ -56,8 +56,6 @@ import java.util.Set;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import org.session.libsession.R;
public class Recipient implements RecipientModifiedListener { public class Recipient implements RecipientModifiedListener {
private static final String TAG = Recipient.class.getSimpleName(); private static final String TAG = Recipient.class.getSimpleName();