Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

[android] Show contact alias in remaining places

Browse Source
This commit is contained in:
Torsten Grote
2018-10-31 12:26:32 -03:00
parent c1785c5b13
commit ecf417c93b
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
View File

@@ -38,6 +38,7 @@ import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.LENGTH_SHORT;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException; 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; import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH;
public class IntroductionMessageFragment extends BaseFragment public class IntroductionMessageFragment extends BaseFragment
@@ -148,8 +149,8 @@ public class IntroductionMessageFragment extends BaseFragment
c2.getAuthor().getId().getBytes())); c2.getAuthor().getId().getBytes()));
// set contact names // set contact names
ui.contactName1.setText(c1.getAuthor().getName()); ui.contactName1.setText(getContactDisplayName(c1));
ui.contactName2.setText(c2.getAuthor().getName()); ui.contactName2.setText(getContactDisplayName(c2));
// hide progress bar // hide progress bar
ui.progressBar.setVisibility(GONE); ui.progressBar.setVisibility(GONE);

4
briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java
View File

@@ -9,6 +9,8 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
class GroupInvitationViewHolder class GroupInvitationViewHolder
extends InvitationViewHolder<GroupInvitationItem> { extends InvitationViewHolder<GroupInvitationItem> {
@@ -24,7 +26,7 @@ class GroupInvitationViewHolder
sharedBy.setText( sharedBy.setText(
sharedBy.getContext().getString(R.string.groups_created_by, sharedBy.getContext().getString(R.string.groups_created_by,
item.getCreator().getAuthor().getName())); getContactDisplayName(item.getCreator())));
} }
} }

3
briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java
View File

@@ -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.getVisibilityIcon;
import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityString; 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.GREY_OUT;
import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
@UiThread @UiThread
@NotNullByDefault @NotNullByDefault
@@ -36,7 +37,7 @@ class RevealableContactViewHolder
icon.setImageResource(getVisibilityIcon(item.getVisibility())); icon.setImageResource(getVisibilityIcon(item.getVisibility()));
info.setText( info.setText(
getVisibilityString(info.getContext(), item.getVisibility(), getVisibilityString(info.getContext(), item.getVisibility(),
item.getContact().getAuthor().getName())); getContactDisplayName(item.getContact())));
} }
@Override @Override

4
briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingInvitationViewHolder.java
View File

@@ -13,6 +13,8 @@ import java.util.Collection;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
class SharingInvitationViewHolder class SharingInvitationViewHolder
extends InvitationViewHolder<SharingInvitationItem> { extends InvitationViewHolder<SharingInvitationItem> {
@@ -28,7 +30,7 @@ class SharingInvitationViewHolder
Collection<String> names = new ArrayList<>(); Collection<String> names = new ArrayList<>();
for (Contact c : item.getNewSharers()) for (Contact c : item.getNewSharers())
names.add(c.getAuthor().getName()); names.add(getContactDisplayName(c));
sharedBy.setText( sharedBy.setText(
sharedBy.getContext().getString(R.string.shared_by_format, sharedBy.getContext().getString(R.string.shared_by_format,
StringUtils.join(names, ", "))); StringUtils.join(names, ", ")));