TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-23 23:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into custom-server

Browse Source 
# Conflicts:
#	src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
This commit is contained in:
Mikunj
2019-10-11 15:40:09 +11:00
parent 4657b79179 ca9032e109
commit 2f18c5bad2
25 changed files with 469 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import android.view.ViewOutlineProvider;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.loki.JazzIdenticonDrawable;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -118,11 +119,15 @@ public class AvatarImageView extends AppCompatImageView {
image = new GeneratedContactPhoto(name, R.drawable.ic_profile_default).asDrawable(context, fallbackColor.toAvatarColor(context));
} else {
image = new JazzIdenticonDrawable(w, h, recipient.getAddress().serialize());
image = new JazzIdenticonDrawable(w, h, recipient.getAddress().serialize().toLowerCase());
}
setImageDrawable(image);
}
public void update(String hexEncodedPublicKey) {
this.recipient = Recipient.from(getContext(), Address.fromSerialized(hexEncodedPublicKey), false);
}
public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, boolean quickContactEnabled) {
this.recipient = recipient;
/*