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

Remove unnecessary recipient resolves.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-01 15:52:28 -04:00
parent d78919acf8
commit b38a3e6259
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1713,7 +1713,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
private void onRecipientChanged(@NonNull Recipient recipient) { private void onRecipientChanged(@NonNull Recipient recipient) {
Log.i(TAG, "onModified(" + recipient.requireAddress().serialize() + ") " + recipient.getRegistered()); Log.i(TAG, "onModified(" + recipient.getId() + ") " + recipient.getRegistered());
titleView.setTitle(glideRequests, recipient); titleView.setTitle(glideRequests, recipient);
titleView.setVerified(identityRecords.isVerified()); titleView.setVerified(identityRecords.isVerified());
setBlockedUserState(recipient, isSecureText, isDefaultSms); setBlockedUserState(recipient, isSecureText, isDefaultSms);

8
src/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@ -972,7 +972,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
if (isGroupThread && !current.isOutgoing()) { if (isGroupThread && !current.isOutgoing()) {
contactPhotoHolder.setVisibility(VISIBLE); contactPhotoHolder.setVisibility(VISIBLE);
if (!previous.isPresent() || previous.get().isUpdate() || !current.getRecipient().requireAddress().equals(previous.get().getRecipient().requireAddress()) || if (!previous.isPresent() || previous.get().isUpdate() || !current.getRecipient().equals(previous.get().getRecipient()) ||
!DateUtils.isSameDay(previous.get().getTimestamp(), current.getTimestamp())) !DateUtils.isSameDay(previous.get().getTimestamp(), current.getTimestamp()))
{ {
groupSenderHolder.setVisibility(VISIBLE); groupSenderHolder.setVisibility(VISIBLE);
@ -980,7 +980,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
groupSenderHolder.setVisibility(GONE); groupSenderHolder.setVisibility(GONE);
} }
if (!next.isPresent() || next.get().isUpdate() || !current.getRecipient().requireAddress().equals(next.get().getRecipient().requireAddress())) { if (!next.isPresent() || next.get().isUpdate() || !current.getRecipient().equals(next.get().getRecipient())) {
contactPhoto.setVisibility(VISIBLE); contactPhoto.setVisibility(VISIBLE);
} else { } else {
contactPhoto.setVisibility(GONE); contactPhoto.setVisibility(GONE);
@ -1040,7 +1040,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
private boolean isStartOfMessageCluster(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, boolean isGroupThread) { private boolean isStartOfMessageCluster(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, boolean isGroupThread) {
if (isGroupThread) { if (isGroupThread) {
return !previous.isPresent() || previous.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), previous.get().getTimestamp()) || return !previous.isPresent() || previous.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), previous.get().getTimestamp()) ||
!current.getRecipient().requireAddress().equals(previous.get().getRecipient().requireAddress()); !current.getRecipient().equals(previous.get().getRecipient());
} else { } else {
return !previous.isPresent() || previous.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), previous.get().getTimestamp()) || return !previous.isPresent() || previous.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), previous.get().getTimestamp()) ||
current.isOutgoing() != previous.get().isOutgoing(); current.isOutgoing() != previous.get().isOutgoing();
@ -1050,7 +1050,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
private boolean isEndOfMessageCluster(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> next, boolean isGroupThread) { private boolean isEndOfMessageCluster(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
if (isGroupThread) { if (isGroupThread) {
return !next.isPresent() || next.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), next.get().getTimestamp()) || return !next.isPresent() || next.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), next.get().getTimestamp()) ||
!current.getRecipient().requireAddress().equals(next.get().getRecipient().requireAddress()); !current.getRecipient().equals(next.get().getRecipient());
} else { } else {
return !next.isPresent() || next.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), next.get().getTimestamp()) || return !next.isPresent() || next.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), next.get().getTimestamp()) ||
current.isOutgoing() != next.get().isOutgoing(); current.isOutgoing() != next.get().isOutgoing();