Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Contact aliases: address review comments

Browse Source
This commit is contained in:
Torsten Grote
2018-10-31 12:05:33 -03:00
parent ecf417c93b
commit 3fe7aae97e
8 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java
View File

@@ -10,7 +10,6 @@ import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder;
import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener;
import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
@UiThread
@NotNullByDefault
@@ -37,8 +36,7 @@ class JoinMessageItemViewHolder
if (item.isInitial()) {
textView.setText(R.string.groups_member_created_you);
} else {
String name = getContactDisplayName(item.getAuthor(),
item.getAuthorInfo().getAlias());
String name = item.getAuthorName();
textView.setText(getContext()
.getString(R.string.groups_member_joined, name));
}
@@ -46,8 +44,7 @@ class JoinMessageItemViewHolder
private void bind(JoinMessageItem item) {
Context ctx = getContext();
String name = getContactDisplayName(item.getAuthor(),
item.getAuthorInfo().getAlias());
String name = item.getAuthorName();
if (item.isInitial()) {
textView.setText(

8
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java
View File

@@ -10,6 +10,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;
import static org.briarproject.briar.android.threaded.ThreadItemAdapter.UNDEFINED;
import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
@NotThreadSafe
@NotNullByDefault
@@ -70,6 +71,13 @@ public abstract class ThreadItem implements MessageNode {
return authorInfo;
}
/**
* Returns the author's name, with an alias if one exists.
*/
public String getAuthorName() {
return getContactDisplayName(author, authorInfo.getAlias());
}
@Override
public void setLevel(int level) {
this.level = level;

2
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
View File

@@ -141,7 +141,7 @@ public class UiUtils {
}
public static Spanned getSpanned(@Nullable String s) {
// TODO move to HtmlCompat
// TODO move to HtmlCompat #1435
// https://commonsware.com/blog/2018/05/29/at-last-htmlcompat.html
return Html.fromHtml(s);
}