From fce1247aa67d316531ae024df5b9976f5813ec2d Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 24 Nov 2020 16:52:52 -0300 Subject: [PATCH] Add a shortcut for setting avatar with ContactItem --- .../briar/android/contact/ContactItemViewHolder.java | 4 +--- .../briar/android/conversation/ConversationActivity.java | 8 +++----- .../android/introduction/IntroductionMessageFragment.java | 6 ++---- .../org/briarproject/briar/android/view/AuthorView.java | 6 ++++++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java index 4ac4db90f..ffdf9d6ec 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactItemViewHolder.java @@ -5,7 +5,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener; @@ -40,8 +39,7 @@ public class ContactItemViewHolder } protected void bind(I item, @Nullable OnContactClickListener listener) { - Author author = item.getContact().getAuthor(); - setAvatar(avatar, author.getId(), item.getAuthorInfo()); + setAvatar(avatar, item); name.setText(getContactDisplayName(item.getContact())); if (bulb != null) { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 72faf405b..e7fc3f91d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -31,7 +31,6 @@ import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; -import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; @@ -234,10 +233,9 @@ public class ConversationActivity extends BriarActivity toolbarStatus = toolbar.findViewById(R.id.contactStatus); toolbarTitle = toolbar.findViewById(R.id.contactName); - observeOnce(viewModel.getContactItem(), this, c -> { - requireNonNull(c); - AuthorId authorId = c.getContact().getAuthor().getId(); - setAvatar(toolbarAvatar, authorId, c.getAuthorInfo()); + observeOnce(viewModel.getContactItem(), this, contactItem -> { + requireNonNull(contactItem); + setAvatar(toolbarAvatar, contactItem); }); viewModel.getContactDisplayName().observe(this, contactName -> { requireNonNull(contactName); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index ad7a0de79..185bc52f1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -165,10 +165,8 @@ public class IntroductionMessageFragment extends BaseFragment contact2 = c2.getContact(); // set avatars - setAvatar(ui.avatar1, c1.getContact().getAuthor().getId(), - c1.getAuthorInfo()); - setAvatar(ui.avatar2, c2.getContact().getAuthor().getId(), - c2.getAuthorInfo()); + setAvatar(ui.avatar1, c1); + setAvatar(ui.avatar2, c2); // set contact names ui.contactName1.setText(getContactDisplayName(c1.getContact())); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java index e1cc4aac2..6cd18ed85 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java @@ -13,6 +13,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.briar.R; +import org.briarproject.briar.android.contact.ContactItem; import org.briarproject.briar.android.conversation.glide.GlideApp; import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.api.identity.AuthorInfo; @@ -113,6 +114,11 @@ public class AuthorView extends ConstraintLayout { } } + public static void setAvatar(ImageView v, ContactItem contactItem) { + AuthorId authorId = contactItem.getContact().getAuthor().getId(); + setAvatar(v, authorId, contactItem.getAuthorInfo()); + } + public void setDate(long date) { this.date.setText(UiUtils.formatDate(getContext(), date));