From 6c5e8ce4cf6720c6e594338774577aff915d2b4d Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 30 Oct 2018 13:40:04 -0300 Subject: [PATCH] Rename remaining occurrences of status to authorInfo --- .../java/org/briarproject/briar/android/forum/ForumItem.java | 4 ++-- .../android/privategroup/conversation/GroupMessageItem.java | 4 ++-- .../android/privategroup/memberlist/MemberListItemHolder.java | 2 +- .../org/briarproject/briar/api/privategroup/GroupMember.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java index 13f1d9a7d..4dae7e7c1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java @@ -18,8 +18,8 @@ class ForumItem extends ThreadItem { } ForumItem(MessageId messageId, @Nullable MessageId parentId, String text, - long timestamp, Author author, AuthorInfo status) { - super(messageId, parentId, text, timestamp, author, status, true); + long timestamp, Author author, AuthorInfo authorInfo) { + super(messageId, parentId, text, timestamp, author, authorInfo, true); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java index 976a7b479..27ce086e9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java @@ -22,8 +22,8 @@ class GroupMessageItem extends ThreadItem { private GroupMessageItem(MessageId messageId, GroupId groupId, @Nullable MessageId parentId, String text, long timestamp, - Author author, AuthorInfo status, boolean isRead) { - super(messageId, parentId, text, timestamp, author, status, isRead); + Author author, AuthorInfo authorInfo, boolean isRead) { + super(messageId, parentId, text, timestamp, author, authorInfo, isRead); this.groupId = groupId; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java index fe29d4714..accaced35 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java @@ -30,7 +30,7 @@ class MemberListItemHolder extends RecyclerView.ViewHolder { } protected void bind(MemberListItem item) { - // member name, avatar and status + // member name, avatar and author info author.setAuthor(item.getMember()); author.setAuthorInfo(item.getAuthorInfo()); diff --git a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java index dfad8223f..6080b6a9e 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java @@ -19,10 +19,10 @@ public class GroupMember { private final ContactId contactId; private final Visibility visibility; - public GroupMember(Author author, AuthorInfo status, boolean isCreator, + public GroupMember(Author author, AuthorInfo authorInfo, boolean isCreator, @Nullable ContactId contactId, Visibility visibility) { this.author = author; - this.authorInfo = status; + this.authorInfo = authorInfo; this.isCreator = isCreator; this.contactId = contactId; this.visibility = visibility; -- GitLab