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 194641f075450af33d1f53022bfc0812671f3deb..ea7858e4874328a412f9f0c02cd301fbf411af34 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 @@ -38,6 +38,7 @@ import static android.view.View.VISIBLE; import static android.widget.Toast.LENGTH_SHORT; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH; public class IntroductionMessageFragment extends BaseFragment @@ -148,8 +149,8 @@ public class IntroductionMessageFragment extends BaseFragment c2.getAuthor().getId().getBytes())); // set contact names - ui.contactName1.setText(c1.getAuthor().getName()); - ui.contactName2.setText(c2.getAuthor().getName()); + ui.contactName1.setText(getContactDisplayName(c1)); + ui.contactName2.setText(getContactDisplayName(c2)); // hide progress bar ui.progressBar.setVisibility(GONE); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java index fae57b85e4a3dc4aa069fcdc7f7b1699daa285e2..b205e2409e2c9311249e08ce40185ee53a11411b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java @@ -9,6 +9,8 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem; import javax.annotation.Nullable; +import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; + class GroupInvitationViewHolder extends InvitationViewHolder<GroupInvitationItem> { @@ -24,7 +26,7 @@ class GroupInvitationViewHolder sharedBy.setText( sharedBy.getContext().getString(R.string.groups_created_by, - item.getCreator().getAuthor().getName())); + getContactDisplayName(item.getCreator()))); } } \ No newline at end of file diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java index ab7777f4bdffc38789b722d627c35f4f9e40d563..f32c34522dd28631db1b6b8db0adfcbc5ee70f3c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityIcon; import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityString; import static org.briarproject.briar.android.util.UiUtils.GREY_OUT; +import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; @UiThread @NotNullByDefault @@ -36,7 +37,7 @@ class RevealableContactViewHolder icon.setImageResource(getVisibilityIcon(item.getVisibility())); info.setText( getVisibilityString(info.getContext(), item.getVisibility(), - item.getContact().getAuthor().getName())); + getContactDisplayName(item.getContact()))); } @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingInvitationViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingInvitationViewHolder.java index 6d4eae929244fafcb5e8662d9ecd6a0d5d1d36e8..9b65e1c8c91015bba3cad265f6537105b4fe7bc6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingInvitationViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingInvitationViewHolder.java @@ -13,6 +13,8 @@ import java.util.Collection; import javax.annotation.Nullable; +import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; + class SharingInvitationViewHolder extends InvitationViewHolder<SharingInvitationItem> { @@ -28,7 +30,7 @@ class SharingInvitationViewHolder Collection<String> names = new ArrayList<>(); for (Contact c : item.getNewSharers()) - names.add(c.getAuthor().getName()); + names.add(getContactDisplayName(c)); sharedBy.setText( sharedBy.getContext().getString(R.string.shared_by_format, StringUtils.join(names, ", ")));