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

Clean

Browse Source
This commit is contained in:
Mikunj 2019-11-28 11:19:39 +11:00
parent bef1e5c469
commit 0cefac1bce
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/ConversationListActivity.java
View File

@ -221,10 +221,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
profilePictureImageView.setClipToOutline(true); profilePictureImageView.setClipToOutline(true);
// Display the correct identicon if we're a secondary device // Display the correct identicon if we're a secondary device
String currentUser = TextSecurePreferences.getLocalNumber(this);
String recipientAddress = recipient.getAddress().serialize();
String primaryAddress = TextSecurePreferences.getMasterHexEncodedPublicKey(this); String primaryAddress = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
String profileAddress = (recipientAddress.equalsIgnoreCase(currentUser) && primaryAddress != null) ? primaryAddress : recipientAddress; String profileAddress = (recipient.isLocalNumber() && primaryAddress != null) ? primaryAddress : recipient.getAddress().serialize();
Recipient primaryRecipient = Recipient.from(this, Address.fromSerialized(profileAddress), false); Recipient primaryRecipient = Recipient.from(this, Address.fromSerialized(profileAddress), false);
Drawable fallback = primaryRecipient.getFallbackContactPhotoDrawable(this, false); Drawable fallback = primaryRecipient.getFallbackContactPhotoDrawable(this, false);
@ -341,9 +339,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onAvatarModified(RecipientAvatarModifiedEvent event) { public void onAvatarModified(RecipientAvatarModifiedEvent event) {
Recipient recipient = event.getRecipient(); Recipient recipient = event.getRecipient();
String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this); if (recipient.isLocalNumber() || recipient.isOurMasterDevice()) {
boolean isOurMasterDevice = ourMasterHexEncodedPublicKey != null && ourMasterHexEncodedPublicKey.equals(recipient.getAddress().serialize());
if (recipient.isLocalNumber() || isOurMasterDevice) {
initializeProfileIcon(recipient); initializeProfileIcon(recipient);
} }
} }

5
src/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@ -279,6 +279,11 @@ public class Recipient implements RecipientModifiedListener {
return isLocalNumber; return isLocalNumber;
} }
public boolean isOurMasterDevice() {
String ourMasterDevice = TextSecurePreferences.getMasterHexEncodedPublicKey(context);
return ourMasterDevice != null && ourMasterDevice.equals(getAddress().serialize());
}
public synchronized @Nullable Uri getContactUri() { public synchronized @Nullable Uri getContactUri() {
return this.contactUri; return this.contactUri;
} }