From ead64d92a55a552a3b4c52255bd608682f12dba2 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 19 Oct 2020 16:27:49 -0400 Subject: [PATCH] Rename Recipient.isLocalNumber() to Recipient.isSelf() --- .../securesms/AvatarPreviewActivity.java | 8 +++---- .../securesms/MediaPreviewActivity.java | 2 +- .../securesms/components/AvatarImageView.java | 2 +- .../securesms/components/FromTextView.java | 10 ++------ .../securesms/components/QuoteView.java | 4 ++-- .../components/TypingStatusRepository.java | 4 ++-- .../contacts/avatars/ProfileContactPhoto.java | 5 +--- .../contacts/sync/DirectoryHelper.java | 5 +--- .../conversation/ConversationActivity.java | 6 ++--- .../conversation/ConversationTitleView.java | 9 ++++--- .../ConversationListItem.java | 2 +- .../securesms/database/GroupDatabase.java | 2 +- .../securesms/database/MmsDatabase.java | 2 +- .../securesms/database/MmsSmsDatabase.java | 8 +++---- .../securesms/database/RecipientDatabase.java | 2 +- .../groups/GroupsV2CapabilityChecker.java | 2 +- .../securesms/groups/LiveGroup.java | 3 +-- .../groups/ui/GroupMemberListAdapter.java | 5 ++-- .../securesms/jobs/PushMediaSendJob.java | 3 +-- .../securesms/jobs/PushProcessMessageJob.java | 4 ++-- .../securesms/jobs/PushTextSendJob.java | 4 +--- .../securesms/jobs/RetrieveProfileJob.java | 8 +++---- .../mediaoverview/MediaGalleryAllAdapter.java | 8 +++---- .../mediasend/MediaSendActivity.java | 3 +-- .../mediasend/MediaSendViewModel.java | 2 +- .../reactions/ReactionRecipientsAdapter.java | 2 +- .../reactions/ReactionsViewModel.java | 2 +- .../securesms/recipients/Recipient.java | 21 ++++++++-------- .../recipients/RecipientDetails.java | 15 +++++------- .../securesms/recipients/RecipientUtil.java | 5 ++-- .../RecipientBottomSheetDialogFragment.java | 24 +++++++++---------- .../bottomsheet/RecipientDialogViewModel.java | 2 +- .../ManageRecipientFragment.java | 6 ++--- .../ManageRecipientViewModel.java | 6 ++--- .../securesms/sms/MessageSender.java | 4 +--- .../securesms/util/AttachmentUtil.java | 2 +- .../securesms/util/RemoteDeleteUtil.java | 12 +++++----- 37 files changed, 94 insertions(+), 120 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java index 4fa1ada7ae..7ee25e7889 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java @@ -82,10 +82,10 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity { RecipientId recipientId = RecipientId.from(getIntent().getStringExtra(RECIPIENT_ID_EXTRA)); Recipient.live(recipientId).observe(this, recipient -> { - ContactPhoto contactPhoto = recipient.isLocalNumber() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar()) - : recipient.getContactPhoto(); - FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large) - : recipient.getFallbackContactPhoto(); + ContactPhoto contactPhoto = recipient.isSelf() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar()) + : recipient.getContactPhoto(); + FallbackContactPhoto fallbackPhoto = recipient.isSelf() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large) + : recipient.getFallbackContactPhoto(); Resources resources = this.getResources(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 294ce5437d..3282271f9b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -194,7 +194,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity if (threadRecipient != null) { if (mediaItem.outgoing || threadRecipient.isGroup()) { - if (threadRecipient.isLocalNumber()) { + if (threadRecipient.isSelf()) { from = getString(R.string.note_to_self); } else { to = threadRecipient.getDisplayName(this); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java index baccb1b045..09ffe28b16 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -117,7 +117,7 @@ public final class AvatarImageView extends AppCompatImageView { * Shows self as the actual profile picture. */ public void setRecipient(@NonNull Recipient recipient) { - if (recipient.isLocalNumber()) { + if (recipient.isSelf()) { setAvatar(GlideApp.with(this), null, false); AvatarUtil.loadIconIntoImageView(recipient, this); } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java index 4463fbae4b..b0c31cf248 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java @@ -4,22 +4,16 @@ import android.content.Context; import android.graphics.Typeface; import androidx.annotation.Nullable; -import androidx.core.view.ViewCompat; + import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; -import android.text.Spanned; -import android.text.style.ForegroundColorSpan; import android.text.style.StyleSpan; -import android.text.style.TypefaceSpan; import android.util.AttributeSet; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.EmojiTextView; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.FeatureFlags; -import org.thoughtcrime.securesms.util.ResUtil; -import org.thoughtcrime.securesms.util.spans.CenterAlignedRelativeSizeSpan; public class FromTextView extends EmojiTextView { @@ -59,7 +53,7 @@ public class FromTextView extends EmojiTextView { Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - if (recipient.isLocalNumber()) { + if (recipient.isSelf()) { builder.append(getContext().getString(R.string.note_to_self)); } else { builder.append(fromSpan); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java index d1fc5341d7..ab489b849b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java @@ -190,8 +190,8 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver { private void setQuoteAuthor(@NonNull Recipient author) { boolean outgoing = messageType != MESSAGE_TYPE_INCOMING; - authorView.setText(author.isLocalNumber() ? getContext().getString(R.string.QuoteView_you) - : author.getDisplayName(getContext())); + authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_you) + : author.getDisplayName(getContext())); // We use the raw color resource because Android 4.x was struggling with tints here quoteBarView.setImageResource(author.getColor().toQuoteBarColorResource(getContext(), outgoing)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java index 6c3ece3aa7..2f8e7c5ad7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java @@ -42,7 +42,7 @@ public class TypingStatusRepository { } public synchronized void onTypingStarted(@NonNull Context context, long threadId, @NonNull Recipient author, int device) { - if (author.isLocalNumber()) { + if (author.isSelf()) { return; } @@ -66,7 +66,7 @@ public class TypingStatusRepository { } public synchronized void onTypingStopped(@NonNull Context context, long threadId, @NonNull Recipient author, int device, boolean isReplacedByIncomingMessage) { - if (author.isLocalNumber()) { + if (author.isSelf()) { return; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java index 35b5125044..c342ae2409 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java @@ -7,13 +7,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; -import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.recipients.RecipientId; import org.whispersystems.libsignal.util.ByteUtil; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.security.MessageDigest; @@ -67,7 +64,7 @@ public class ProfileContactPhoto implements ContactPhoto { } private long getFileLastModified() { - if (!recipient.isLocalNumber()) { + if (!recipient.isSelf()) { return 0; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java index 05135fd6c2..a58e96fe0d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java @@ -29,8 +29,6 @@ import org.thoughtcrime.securesms.database.MessageDatabase.InsertResult; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase.BulkOperationsHandle; import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState; -import org.thoughtcrime.securesms.database.SessionDatabase; -import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob; import org.thoughtcrime.securesms.jobs.RetrieveProfileJob; @@ -45,7 +43,6 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.sms.IncomingJoinedMessage; -import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.ProfileUtil; import org.thoughtcrime.securesms.util.SetUtil; import org.thoughtcrime.securesms.util.Stopwatch; @@ -398,7 +395,7 @@ public class DirectoryHelper { for (RecipientId newUser: newUsers) { Recipient recipient = Recipient.resolved(newUser); - if (!SessionUtil.hasSession(context, recipient.getId()) && !recipient.isLocalNumber()) { + if (!SessionUtil.hasSession(context, recipient.getId()) && !recipient.isSelf()) { IncomingJoinedMessage message = new IncomingJoinedMessage(newUser); Optional insertResult = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 0d5a24169c..0b9bb4c8f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -837,7 +837,7 @@ public class ConversationActivity extends PassphraseRequiredActivity inflater.inflate(R.menu.conversation_add_to_contacts, menu); } - if (recipient != null && recipient.get().isLocalNumber()) { + if (recipient != null && recipient.get().isSelf()) { if (isSecureText) { hideMenuItem(menu, R.id.menu_call_secure); hideMenuItem(menu, R.id.menu_video_secure); @@ -1223,7 +1223,7 @@ public class ConversationActivity extends PassphraseRequiredActivity @NonNull Recipient recipient) { IconCompat icon = IconCompat.createWithAdaptiveBitmap(bitmap); - String name = recipient.isLocalNumber() ? context.getString(R.string.note_to_self) + String name = recipient.isSelf() ? context.getString(R.string.note_to_self) : recipient.getDisplayName(context); ShortcutInfoCompat shortcutInfoCompat = new ShortcutInfoCompat.Builder(context, recipient.getId().serialize() + '-' + System.currentTimeMillis()) @@ -2400,7 +2400,7 @@ public class ConversationActivity extends PassphraseRequiredActivity if (!TextSecurePreferences.isPushRegistered(this)) return false; if (recipient.get().isGroup()) return false; - return recipient.get().isLocalNumber(); + return recipient.get().isSelf(); } private boolean isGroupConversation() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java index bb9d4f2c27..f61c3a4930 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java @@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.recipients.LiveRecipient; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.ExpirationUtil; -import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; @@ -97,7 +96,7 @@ public class ConversationTitleView extends RelativeLayout { startDrawable = R.drawable.ic_volume_off_white_18dp; } - if (recipient != null && recipient.isSystemContact() && !recipient.isLocalNumber()) { + if (recipient != null && recipient.isSystemContact() && !recipient.isSelf()) { endDrawable = R.drawable.ic_profile_circle_outline_16; } @@ -125,7 +124,7 @@ public class ConversationTitleView extends RelativeLayout { private void setRecipientTitle(Recipient recipient) { if (recipient.isGroup()) setGroupRecipientTitle(recipient); - else if (recipient.isLocalNumber()) setSelfTitle(); + else if (recipient.isSelf()) setSelfTitle(); else setIndividualRecipientTitle(recipient); } @@ -145,8 +144,8 @@ public class ConversationTitleView extends RelativeLayout { private void setGroupRecipientTitle(Recipient recipient) { this.title.setText(recipient.getDisplayName(getContext())); this.subtitle.setText(Stream.of(recipient.getParticipants()) - .sorted((a, b) -> Boolean.compare(a.isLocalNumber(), b.isLocalNumber())) - .map(r -> r.isLocalNumber() ? getResources().getString(R.string.ConversationTitleView_you) + .sorted((a, b) -> Boolean.compare(a.isSelf(), b.isSelf())) + .map(r -> r.isSelf() ? getResources().getString(R.string.ConversationTitleView_you) : r.getDisplayName(getContext())) .collect(Collectors.joining(", "))); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java index e8c59aa49c..afc2481321 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java @@ -171,7 +171,7 @@ public final class ConversationListItem extends RelativeLayout this.recipient.observeForever(this); if (highlightSubstring != null) { - String name = recipient.get().isLocalNumber() ? getContext().getString(R.string.note_to_self) : recipient.get().getDisplayName(getContext()); + String name = recipient.get().isSelf() ? getContext().getString(R.string.note_to_self) : recipient.get().getDisplayName(getContext()); this.fromView.setText(SearchUtil.getHighlightedSpan(locale, () -> new StyleSpan(Typeface.BOLD), name, highlightSubstring)); } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index 3ad8510e43..a0afe43a81 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -305,7 +305,7 @@ public final class GroupDatabase extends Database { for (RecipientId member : currentMembers) { Recipient resolved = Recipient.resolved(member); - if (memberSet.includeSelf || !resolved.isLocalNumber()) { + if (memberSet.includeSelf || !resolved.isSelf()) { recipients.add(resolved); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index f4743debea..355a091923 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -1414,7 +1414,7 @@ public class MmsDatabase extends MessageDatabase { AttachmentDatabase partsDatabase = DatabaseFactory.getAttachmentDatabase(context); MentionDatabase mentionDatabase = DatabaseFactory.getMentionDatabase(context); - boolean mentionsSelf = Stream.of(mentions).filter(m -> Recipient.resolved(m.getRecipientId()).isLocalNumber()).findFirst().isPresent(); + boolean mentionsSelf = Stream.of(mentions).filter(m -> Recipient.resolved(m.getRecipientId()).isSelf()).findFirst().isPresent(); List allAttachments = new LinkedList<>(); List contactAttachments = Stream.of(sharedContacts).map(Contact::getAvatarAttachment).filter(a -> a != null).toList(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index 65641c3a36..d2cef3e100 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java @@ -151,8 +151,8 @@ public class MmsSmsDatabase extends Database { MessageRecord messageRecord; while ((messageRecord = reader.getNext()) != null) { - if ((Recipient.resolved(author).isLocalNumber() && messageRecord.isOutgoing()) || - (!Recipient.resolved(author).isLocalNumber() && messageRecord.getIndividualRecipient().getId().equals(author))) + if ((Recipient.resolved(author).isSelf() && messageRecord.isOutgoing()) || + (!Recipient.resolved(author).isSelf() && messageRecord.getIndividualRecipient().getId().equals(author))) { return messageRecord; } @@ -345,7 +345,7 @@ public class MmsSmsDatabase extends Database { String selection = MmsSmsColumns.THREAD_ID + " = " + threadId + " AND " + MmsSmsColumns.REMOTE_DELETED + " = 0"; try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_SENT, MmsSmsColumns.RECIPIENT_ID}, selection, order, null)) { - boolean isOwnNumber = Recipient.resolved(recipientId).isLocalNumber(); + boolean isOwnNumber = Recipient.resolved(recipientId).isSelf(); while (cursor != null && cursor.moveToNext()) { boolean quoteIdMatches = cursor.getLong(0) == quoteId; @@ -364,7 +364,7 @@ public class MmsSmsDatabase extends Database { String selection = MmsSmsColumns.THREAD_ID + " = " + threadId + " AND " + MmsSmsColumns.REMOTE_DELETED + " = 0"; try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_RECEIVED, MmsSmsColumns.RECIPIENT_ID}, selection, order, null)) { - boolean isOwnNumber = Recipient.resolved(recipientId).isLocalNumber(); + boolean isOwnNumber = Recipient.resolved(recipientId).isSelf(); while (cursor != null && cursor.moveToNext()) { boolean timestampMatches = cursor.getLong(0) == receivedTimestamp; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java index 0a42cad9c2..dc2186e7d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -2123,7 +2123,7 @@ public class RecipientDatabase extends Database { } return Stream.of(recipientsWithinInteractionThreshold) - .filterNot(Recipient::isLocalNumber) + .filterNot(Recipient::isSelf) .filter(r -> r.getLastProfileFetchTime() < lastProfileFetchThreshold) .limit(limit) .map(Recipient::getId) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java index 3eb10c2f2d..a5d43a6dbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2CapabilityChecker.java @@ -81,7 +81,7 @@ public final class GroupsV2CapabilityChecker { Log.w(TAG, "At least one recipient does not support GV2, capability was " + gv2Capability); noGv2Count++; - if (member.isLocalNumber()) { + if (member.isSelf()) { noSelfGV2Support = true; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java index d71805803c..c2a9794ad8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java @@ -21,7 +21,6 @@ import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry; import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl; -import org.thoughtcrime.securesms.groups.v2.GroupLinkPassword; import org.thoughtcrime.securesms.groups.v2.GroupLinkUrlAndStatus; import org.thoughtcrime.securesms.recipients.LiveRecipient; import org.thoughtcrime.securesms.recipients.Recipient; @@ -36,7 +35,7 @@ import java.util.List; public final class LiveGroup { - private static final Comparator LOCAL_FIRST = (m1, m2) -> Boolean.compare(m2.getMember().isLocalNumber(), m1.getMember().isLocalNumber()); + private static final Comparator LOCAL_FIRST = (m1, m2) -> Boolean.compare(m2.getMember().isSelf(), m1.getMember().isSelf()); private static final Comparator ADMIN_FIRST = (m1, m2) -> Boolean.compare(m2.isAdmin(), m1.isAdmin()); private static final Comparator HAS_DISPLAY_NAME = (m1, m2) -> Boolean.compare(m2.getMember().hasAUserSetDisplayName(ApplicationDependencies.getApplication()), m1.getMember().hasAUserSetDisplayName(ApplicationDependencies.getApplication())); private static final Comparator ALPHABETICAL = (m1, m2) -> m1.getMember().getDisplayName(ApplicationDependencies.getApplication()).compareToIgnoreCase(m2.getMember().getDisplayName(ApplicationDependencies.getApplication())); diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java index 708e3c3ff1..2a0be29deb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java @@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.components.AvatarImageView; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.LifecycleRecyclerAdapter; import org.thoughtcrime.securesms.util.LifecycleViewHolder; -import org.thoughtcrime.securesms.util.Util; import java.util.ArrayList; import java.util.HashSet; @@ -200,8 +199,8 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter recipients = DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_EXCLUDING_SELF); @@ -427,7 +427,7 @@ public class RetrieveProfileJob extends BaseJob { if (!recipient.isBlocked() && !recipient.isGroup() && - !recipient.isLocalNumber() && + !recipient.isSelf() && !localDisplayName.isEmpty() && !remoteDisplayName.equals(localDisplayName)) { @@ -435,7 +435,7 @@ public class RetrieveProfileJob extends BaseJob { DatabaseFactory.getSmsDatabase(context).insertProfileNameChangeMessages(recipient, remoteDisplayName, localDisplayName); } else { Log.i(TAG, String.format(Locale.US, "Name changed, but wasn't relevant to write an event. blocked: %s, group: %s, self: %s, firstSet: %s, displayChange: %s", - recipient.isBlocked(), recipient.isGroup(), recipient.isLocalNumber(), localDisplayName.isEmpty(), !remoteDisplayName.equals(localDisplayName))); + recipient.isBlocked(), recipient.isGroup(), recipient.isSelf(), localDisplayName.isEmpty(), !remoteDisplayName.equals(localDisplayName))); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java index ba23ede94b..468ae751a9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java @@ -383,18 +383,18 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter { } private String getSentFromToString(@NonNull Recipient from, @NonNull Recipient thread) { - if (from.isLocalNumber() && from == thread) { + if (from.isSelf() && from == thread) { return context.getString(R.string.note_to_self); } - if (showThread && (from.isLocalNumber() || thread.isGroup())) { - if (from.isLocalNumber()) { + if (showThread && (from.isSelf() || thread.isGroup())) { + if (from.isSelf()) { return context.getString(R.string.MediaOverviewActivity_sent_by_you_to_s, thread.getDisplayName(context)); } else { return context.getString(R.string.MediaOverviewActivity_sent_by_s_to_s, from.getDisplayName(context), thread.getDisplayName(context)); } } else { - if (from.isLocalNumber()) { + if (from.isSelf()) { return context.getString(R.string.MediaOverviewActivity_sent_by_you); } else { return context.getString(R.string.MediaOverviewActivity_sent_by_s, from.getDisplayName(context)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index 71647e1c8e..2dbaa53480 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -64,7 +64,6 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.scribbles.ImageEditorFragment; import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState; -import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.Function3; import org.thoughtcrime.securesms.util.IOFunction; import org.thoughtcrime.securesms.util.MediaUtil; @@ -829,7 +828,7 @@ public class MediaSendActivity extends PassphraseRequiredActivity implements Med private void presentRecipient(@Nullable Recipient recipient) { if (recipient == null) { composeText.setHint(R.string.MediaSendActivity_message); - } else if (recipient.isLocalNumber()) { + } else if (recipient.isSelf()) { composeText.setHint(getString(R.string.note_to_self), null); } else { composeText.setHint(getString(R.string.MediaSendActivity_message_to_s, recipient.getDisplayName(this)), null); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index 28fc30e014..bc56d8d63a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java @@ -601,7 +601,7 @@ class MediaSendViewModel extends ViewModel { } private boolean viewOnceSupported() { - return !isSms && (recipient == null || !recipient.isLocalNumber()) && mediaSupportsRevealableMessage(getSelectedMediaOrDefault()); + return !isSms && (recipient == null || !recipient.isSelf()) && mediaSupportsRevealableMessage(getSelectedMediaOrDefault()); } private boolean mediaSupportsRevealableMessage(@NonNull List media) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java index 57c7a2b9bb..7dfe499787 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java @@ -60,7 +60,7 @@ final class ReactionRecipientsAdapter extends RecyclerView.Adapter reactions) { for (ReactionDetails reaction : reactions) { - if (reaction.getSender().isLocalNumber()) { + if (reaction.getSender().isSelf()) { return reaction.getDisplayEmoji(); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index d97ad07ddf..1dd46df3cc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.TransparentContactPhoto; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase.MentionSetting; import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState; @@ -73,7 +72,7 @@ public class Recipient { private final GroupId groupId; private final List participants; private final Optional groupAvatarId; - private final boolean localNumber; + private final boolean isSelf; private final boolean blocked; private final long muteUntil; private final VibrateState messageVibrate; @@ -286,7 +285,7 @@ public class Recipient { this.groupId = null; this.participants = Collections.emptyList(); this.groupAvatarId = Optional.absent(); - this.localNumber = false; + this.isSelf = false; this.blocked = false; this.muteUntil = 0; this.messageVibrate = VibrateState.DEFAULT; @@ -328,7 +327,7 @@ public class Recipient { this.groupId = details.groupId; this.participants = details.participants; this.groupAvatarId = details.groupAvatarId; - this.localNumber = details.isLocalNumber; + this.isSelf = details.isSelf; this.blocked = details.blocked; this.muteUntil = details.mutedUntil; this.messageVibrate = details.messageVibrateState; @@ -364,8 +363,8 @@ public class Recipient { return id; } - public boolean isLocalNumber() { - return localNumber; + public boolean isSelf() { + return isSelf; } public @Nullable Uri getContactUri() { @@ -418,8 +417,8 @@ public class Recipient { } public @NonNull String getMentionDisplayName(@NonNull Context context) { - String name = Util.getFirstNonEmpty(localNumber ? getProfileName().toString() : getName(context), - localNumber ? getName(context) : getProfileName().toString(), + String name = Util.getFirstNonEmpty(isSelf ? getProfileName().toString() : getName(context), + isSelf ? getName(context) : getProfileName().toString(), e164, email, context.getString(R.string.Recipient_unknown)); @@ -630,7 +629,7 @@ public class Recipient { } public boolean isActiveGroup() { - return Stream.of(getParticipants()).anyMatch(Recipient::isLocalNumber); + return Stream.of(getParticipants()).anyMatch(Recipient::isSelf); } public @NonNull List getParticipants() { @@ -658,7 +657,7 @@ public class Recipient { } public @NonNull FallbackContactPhoto getFallbackContactPhoto(@NonNull FallbackPhotoProvider fallbackPhotoProvider) { - if (localNumber) return fallbackPhotoProvider.getPhotoForLocalNumber(); + if (isSelf) return fallbackPhotoProvider.getPhotoForLocalNumber(); else if (isResolving()) return fallbackPhotoProvider.getPhotoForResolvingRecipient(); else if (isGroupInternal()) return fallbackPhotoProvider.getPhotoForGroup(); else if (isGroup()) return fallbackPhotoProvider.getPhotoForGroup(); @@ -667,7 +666,7 @@ public class Recipient { } public @Nullable ContactPhoto getContactPhoto() { - if (localNumber) return null; + if (isSelf) return null; else if (isGroupInternal() && groupAvatarId.isPresent()) return new GroupRecordContactPhoto(groupId, groupAvatarId.get()); else if (systemContactPhoto != null) return new SystemContactPhoto(id, systemContactPhoto, 0); else if (profileAvatar != null && hasProfileImage) return new ProfileContactPhoto(this, profileAvatar); diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java index f23bac94b8..6adafba8c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java @@ -8,8 +8,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.thoughtcrime.securesms.color.MaterialColor; -import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus; -import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase.InsightsBannerTier; import org.thoughtcrime.securesms.database.RecipientDatabase.MentionSetting; import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings; @@ -17,7 +15,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState; import org.thoughtcrime.securesms.database.RecipientDatabase.UnidentifiedAccessMode; import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; import org.thoughtcrime.securesms.groups.GroupId; -import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.profiles.ProfileName; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; @@ -58,7 +55,7 @@ public class RecipientDetails { final boolean profileSharing; final long lastProfileFetch; final boolean systemContact; - final boolean isLocalNumber; + final boolean isSelf; final String notificationChannel; final UnidentifiedAccessMode unidentifiedAccessMode; final boolean forceSmsSelection; @@ -71,7 +68,7 @@ public class RecipientDetails { public RecipientDetails(@Nullable String name, @NonNull Optional groupAvatarId, boolean systemContact, - boolean isLocalNumber, + boolean isSelf, @NonNull RecipientSettings settings, @Nullable List participants) { @@ -103,7 +100,7 @@ public class RecipientDetails { this.profileSharing = settings.isProfileSharing(); this.lastProfileFetch = settings.getLastProfileFetch(); this.systemContact = systemContact; - this.isLocalNumber = isLocalNumber; + this.isSelf = isSelf; this.notificationChannel = settings.getNotificationChannel(); this.unidentifiedAccessMode = settings.getUnidentifiedAccessMode(); this.forceSmsSelection = settings.isForceSmsSelection(); @@ -150,7 +147,7 @@ public class RecipientDetails { this.profileSharing = false; this.lastProfileFetch = 0; this.systemContact = true; - this.isLocalNumber = false; + this.isSelf = false; this.notificationChannel = null; this.unidentifiedAccessMode = UnidentifiedAccessMode.UNKNOWN; this.forceSmsSelection = false; @@ -163,9 +160,9 @@ public class RecipientDetails { public static @NonNull RecipientDetails forIndividual(@NonNull Context context, @NonNull RecipientSettings settings) { boolean systemContact = !TextUtils.isEmpty(settings.getSystemDisplayName()); - boolean isLocalNumber = (settings.getE164() != null && settings.getE164().equals(TextSecurePreferences.getLocalNumber(context))) || + boolean isSelf = (settings.getE164() != null && settings.getE164().equals(TextSecurePreferences.getLocalNumber(context))) || (settings.getUuid() != null && settings.getUuid().equals(TextSecurePreferences.getLocalUuid(context))); - return new RecipientDetails(null, Optional.absent(), systemContact, isLocalNumber, settings, null); + return new RecipientDetails(null, Optional.absent(), systemContact, isSelf, settings, null); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java index dd6ce37712..c8d9c08bbf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java @@ -23,7 +23,6 @@ import org.thoughtcrime.securesms.jobs.RotateProfileKeyJob; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.storage.StorageSyncHelper; -import org.thoughtcrime.securesms.util.FeatureFlags; import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.signalservice.api.push.SignalServiceAddress; @@ -253,7 +252,7 @@ public class RecipientUtil { } public static boolean isLegacyProfileSharingAccepted(@NonNull Recipient threadRecipient) { - return threadRecipient.isLocalNumber() || + return threadRecipient.isSelf() || threadRecipient.isProfileSharing() || threadRecipient.isSystemContact() || !threadRecipient.isRegistered() || @@ -262,7 +261,7 @@ public class RecipientUtil { @WorkerThread private static boolean isMessageRequestAccepted(@NonNull Context context, long threadId, @NonNull Recipient threadRecipient) { - return threadRecipient.isLocalNumber() || + return threadRecipient.isSelf() || threadRecipient.isProfileSharing() || threadRecipient.isSystemContact() || threadRecipient.isForceSmsSelection() || diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java index 1c016b3354..2d7e2ddfcc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java @@ -139,24 +139,24 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF } }); avatar.setAvatar(recipient); - if (recipient.isLocalNumber()) { + if (recipient.isSelf()) { avatar.setOnClickListener(v -> { dismiss(); viewModel.onMessageClicked(requireActivity()); }); } - String name = recipient.isLocalNumber() ? requireContext().getString(R.string.note_to_self) + String name = recipient.isSelf() ? requireContext().getString(R.string.note_to_self) : recipient.getDisplayName(requireContext()); fullName.setText(name); fullName.setVisibility(TextUtils.isEmpty(name) ? View.GONE : View.VISIBLE); - if (recipient.isSystemContact() && !recipient.isLocalNumber()) { + if (recipient.isSystemContact() && !recipient.isSelf()) { fullName.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_profile_circle_outline_16, 0); fullName.setCompoundDrawablePadding(ViewUtil.dpToPx(4)); TextViewCompat.setCompoundDrawableTintList(fullName, ColorStateList.valueOf(ThemeUtil.getThemedColor(requireContext(), R.attr.title_text_color_primary))); } - String usernameNumberString = recipient.hasAUserSetDisplayName(requireContext()) && !recipient.isLocalNumber() + String usernameNumberString = recipient.hasAUserSetDisplayName(requireContext()) && !recipient.isSelf() ? recipient.getSmsAddress().or("").trim() : ""; usernameNumber.setText(usernameNumberString); @@ -168,24 +168,24 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF return true; }); - noteToSelfDescription.setVisibility(recipient.isLocalNumber() ? View.VISIBLE : View.GONE); + noteToSelfDescription.setVisibility(recipient.isSelf() ? View.VISIBLE : View.GONE); if (RecipientUtil.isBlockable(recipient)) { boolean blocked = recipient.isBlocked(); - blockButton .setVisibility(recipient.isLocalNumber() || blocked ? View.GONE : View.VISIBLE); - unblockButton.setVisibility(recipient.isLocalNumber() || !blocked ? View.GONE : View.VISIBLE); + blockButton .setVisibility(recipient.isSelf() || blocked ? View.GONE : View.VISIBLE); + unblockButton.setVisibility(recipient.isSelf() || !blocked ? View.GONE : View.VISIBLE); } else { blockButton .setVisibility(View.GONE); unblockButton.setVisibility(View.GONE); } - messageButton.setVisibility(!recipient.isLocalNumber() ? View.VISIBLE : View.GONE); - secureCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); - insecureCallButton.setVisibility(!recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); - secureVideoCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); + messageButton.setVisibility(!recipient.isSelf() ? View.VISIBLE : View.GONE); + secureCallButton.setVisibility(recipient.isRegistered() && !recipient.isSelf() ? View.VISIBLE : View.GONE); + insecureCallButton.setVisibility(!recipient.isRegistered() && !recipient.isSelf() ? View.VISIBLE : View.GONE); + secureVideoCallButton.setVisibility(recipient.isRegistered() && !recipient.isSelf() ? View.VISIBLE : View.GONE); - if (recipient.isSystemContact() || recipient.isGroup() || recipient.isLocalNumber()) { + if (recipient.isSystemContact() || recipient.isGroup() || recipient.isSelf()) { addContactButton.setVisibility(View.GONE); } else { addContactButton.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java index 34bc50e672..ba3c44ae1c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java @@ -84,7 +84,7 @@ final class RecipientDialogViewModel extends ViewModel { MutableLiveData localGroupCount = new MutableLiveData<>(0); canAddToAGroup = LiveDataUtil.combineLatest(recipient, localGroupCount, - (r, count) -> count > 0 && r.isRegistered() && !r.isGroup() && !r.isLocalNumber()); + (r, count) -> count > 0 && r.isRegistered() && !r.isGroup() && !r.isSelf()); recipientDialogRepository.getActiveGroupCount(localGroupCount::postValue); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java index 8d78c118b9..1cf83c6b33 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java @@ -317,9 +317,9 @@ public class ManageRecipientFragment extends LoggingFragment { colorChip.setImageDrawable(new ColorStateDrawable(colorDrawable, color)); colorRow.setOnClickListener(v -> handleColorSelection(color)); - secureCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); - insecureCallButton.setVisibility(!recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); - secureVideoCallButton.setVisibility(recipient.isRegistered() && !recipient.isLocalNumber() ? View.VISIBLE : View.GONE); + secureCallButton.setVisibility(recipient.isRegistered() && !recipient.isSelf() ? View.VISIBLE : View.GONE); + insecureCallButton.setVisibility(!recipient.isRegistered() && !recipient.isSelf() ? View.VISIBLE : View.GONE); + secureVideoCallButton.setVisibility(recipient.isRegistered() && !recipient.isSelf() ? View.VISIBLE : View.GONE); } private void presentMediaCursor(ManageRecipientViewModel.MediaCursor mediaCursor) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java index e8a5945c0f..19c4da278a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientViewModel.java @@ -109,13 +109,13 @@ public final class ManageRecipientViewModel extends ViewModel { this.canAddToAGroup = LiveDataUtil.combineLatest(recipient, localGroupCount, - (r, count) -> count > 0 && r.isRegistered() && !r.isGroup() && !r.isLocalNumber()); + (r, count) -> count > 0 && r.isRegistered() && !r.isGroup() && !r.isSelf()); manageRecipientRepository.getActiveGroupCount(localGroupCount::postValue); } private static @NonNull String getDisplayTitle(@NonNull Recipient recipient, @NonNull Context context) { - if (recipient.isLocalNumber()) { + if (recipient.isSelf()) { return context.getString(R.string.note_to_self); } else { return recipient.getDisplayName(context); @@ -123,7 +123,7 @@ public final class ManageRecipientViewModel extends ViewModel { } private static @NonNull String getDisplaySubtitle(@NonNull Recipient recipient, @NonNull Context context) { - if (!recipient.isLocalNumber() && recipient.hasAUserSetDisplayName(context)) { + if (!recipient.isSelf() && recipient.hasAUserSetDisplayName(context)) { return recipient.getSmsAddress().or("").trim(); } else { return ""; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java index 799dc6fc6e..32fb2fcc21 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java @@ -34,11 +34,9 @@ import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper; import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.database.AttachmentDatabase; -import org.thoughtcrime.securesms.database.Database; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.MessageDatabase.SyncMessageId; -import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.MmsSmsDatabase; import org.thoughtcrime.securesms.database.NoSuchMessageException; import org.thoughtcrime.securesms.database.RecipientDatabase; @@ -461,7 +459,7 @@ public class MessageSender { public static boolean isLocalSelfSend(@NonNull Context context, @Nullable Recipient recipient, boolean forceSms) { return recipient != null && - recipient.isLocalNumber() && + recipient.isSelf() && !forceSms && TextSecurePreferences.isPushRegistered(context) && !TextSecurePreferences.isMultiDevice(context); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java index b62d1394c6..d63203da05 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -128,6 +128,6 @@ public class AttachmentUtil { return recipient.isSystemContact() || recipient.isProfileSharing() || message.isOutgoing() || - recipient.isLocalNumber(); + recipient.isSelf(); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeleteUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeleteUtil.java index c7912bdf52..3b3dea107b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeleteUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeleteUtil.java @@ -18,14 +18,14 @@ public final class RemoteDeleteUtil { private RemoteDeleteUtil() {} public static boolean isValidReceive(@NonNull MessageRecord targetMessage, @NonNull Recipient deleteSender, long deleteServerTimestamp) { - boolean isValidIncomingOutgoing = (deleteSender.isLocalNumber() && targetMessage.isOutgoing()) || - (!deleteSender.isLocalNumber() && !targetMessage.isOutgoing()); + boolean isValidIncomingOutgoing = (deleteSender.isSelf() && targetMessage.isOutgoing()) || + (!deleteSender.isSelf() && !targetMessage.isOutgoing()); boolean isValidSender = targetMessage.getIndividualRecipient().equals(deleteSender) || - deleteSender.isLocalNumber() && targetMessage.isOutgoing(); + deleteSender.isSelf() && targetMessage.isOutgoing(); - long messageTimestamp = deleteSender.isLocalNumber() && targetMessage.isOutgoing() ? targetMessage.getDateSent() - : targetMessage.getServerTimestamp(); + long messageTimestamp = deleteSender.isSelf() && targetMessage.isOutgoing() ? targetMessage.getDateSent() + : targetMessage.getServerTimestamp(); return isValidIncomingOutgoing && isValidSender && @@ -41,7 +41,7 @@ public final class RemoteDeleteUtil { return message.isOutgoing() && message.isPush() && (!message.getRecipient().isGroup() || message.getRecipient().isActiveGroup()) && - !message.getRecipient().isLocalNumber() && + !message.getRecipient().isSelf() && !message.isRemoteDelete() && (currentTime - message.getDateSent()) < SEND_THRESHOLD; }