From 52060ac9fd0d8220d85639b8175217b5d0d2f8cf Mon Sep 17 00:00:00 2001 From: Mikunj Date: Wed, 1 Apr 2020 14:16:31 +1100 Subject: [PATCH 1/2] Fix avatar and names on Note to self --- .../securesms/conversation/ConversationActivity.java | 4 +++- .../securesms/loki/redesign/views/ProfilePictureView.kt | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 763496b9cd..d1b9136ddd 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -3152,7 +3152,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity subtitleTextView.setVisibility(View.GONE); } } else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) { - subtitleTextView.setText(recipient.getAddress().toString()); + String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this); + String hexEncodedPublicKey = (recipient.isLocalNumber() && ourMasterHexEncodedPublicKey != null) ? ourMasterHexEncodedPublicKey : recipient.getAddress().toPhoneString(); + subtitleTextView.setText(hexEncodedPublicKey); } else { subtitleTextView.setVisibility(View.GONE); } diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt index 55b89dd85f..8cc1788852 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt @@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.database.Address import org.thoughtcrime.securesms.loki.JazzIdenticonDrawable import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.recipients.Recipient +import org.thoughtcrime.securesms.util.TextSecurePreferences // TODO: Look into a better way of handling different sizes. Maybe an enum (with associated values) encapsulating the different modes? @@ -60,12 +61,15 @@ class ProfilePictureView : RelativeLayout { fun setProfilePictureIfNeeded(imageView: ImageView, hexEncodedPublicKey: String, @DimenRes sizeID: Int) { glide.clear(imageView) if (hexEncodedPublicKey.isNotEmpty()) { - val signalProfilePicture = Recipient.from(context, Address.fromSerialized(hexEncodedPublicKey), false).contactPhoto + val recipient = Recipient.from(context, Address.fromSerialized(hexEncodedPublicKey), false); + val signalProfilePicture = recipient.contactPhoto if (signalProfilePicture != null && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "0" && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "") { glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView) } else { val size = resources.getDimensionPixelSize(sizeID) - val jazzIcon = JazzIdenticonDrawable(size, size, hexEncodedPublicKey) + val primaryAddress = TextSecurePreferences.getMasterHexEncodedPublicKey(context) + val profileAddress = if (recipient.isLocalNumber && primaryAddress != null) primaryAddress else hexEncodedPublicKey + val jazzIcon = JazzIdenticonDrawable(size, size, profileAddress) glide.load(jazzIcon).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView) } } else { From 1f6ea3b55c4a4a516169dcc26f95b4f2fd5a9caa Mon Sep 17 00:00:00 2001 From: gmbnt Date: Mon, 6 Apr 2020 14:34:19 +1000 Subject: [PATCH 2/2] Maintain consistent code style --- .../securesms/loki/redesign/views/ProfilePictureView.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt index 8cc1788852..bc43369461 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt @@ -67,9 +67,9 @@ class ProfilePictureView : RelativeLayout { glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView) } else { val size = resources.getDimensionPixelSize(sizeID) - val primaryAddress = TextSecurePreferences.getMasterHexEncodedPublicKey(context) - val profileAddress = if (recipient.isLocalNumber && primaryAddress != null) primaryAddress else hexEncodedPublicKey - val jazzIcon = JazzIdenticonDrawable(size, size, profileAddress) + val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context) + val hepk = if (recipient.isLocalNumber && masterHexEncodedPublicKey != null) masterHexEncodedPublicKey else hexEncodedPublicKey + val jazzIcon = JazzIdenticonDrawable(size, size, hepk) glide.load(jazzIcon).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView) } } else {