Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
6c5e8ce4
Verified
Commit
6c5e8ce4
authored
Oct 30, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename remaining occurrences of status to authorInfo
parent
baf64e11
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java
.../java/org/briarproject/briar/android/forum/ForumItem.java
+2
-2
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java
...r/android/privategroup/conversation/GroupMessageItem.java
+2
-2
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java
...android/privategroup/memberlist/MemberListItemHolder.java
+1
-1
briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java
.../org/briarproject/briar/api/privategroup/GroupMember.java
+2
-2
No files found.
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java
View file @
6c5e8ce4
...
...
@@ -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
);
}
}
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageItem.java
View file @
6c5e8ce4
...
...
@@ -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
;
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java
View file @
6c5e8ce4
...
...
@@ -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
());
...
...
briar-api/src/main/java/org/briarproject/briar/api/privategroup/GroupMember.java
View file @
6c5e8ce4
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment