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
681
Issues
681
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
fb2c321a
Verified
Commit
fb2c321a
authored
Oct 29, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[android] Show contact alias inside private groups and their memberlist
parent
6e3adc08
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
12 deletions
+27
-12
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java
.../privategroup/conversation/JoinMessageItemViewHolder.java
+11
-7
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java
...ar/android/privategroup/memberlist/MemberListAdapter.java
+12
-3
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java
...android/privategroup/memberlist/MemberListItemHolder.java
+4
-2
No files found.
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java
View file @
fb2c321a
...
...
@@ -10,6 +10,7 @@ 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
...
...
@@ -36,24 +37,27 @@ class JoinMessageItemViewHolder
if
(
item
.
isInitial
())
{
textView
.
setText
(
R
.
string
.
groups_member_created_you
);
}
else
{
textView
.
setText
(
getContext
().
getString
(
R
.
string
.
groups_member_joined
,
item
.
getAuthor
().
getName
()));
String
name
=
getContactDisplayName
(
item
.
getAuthor
(),
item
.
getAuthorInfo
().
getAlias
());
textView
.
setText
(
getContext
()
.
getString
(
R
.
string
.
groups_member_joined
,
name
));
}
}
private
void
bind
(
JoinMessageItem
item
)
{
Context
ctx
=
getContext
();
String
name
=
getContactDisplayName
(
item
.
getAuthor
(),
item
.
getAuthorInfo
().
getAlias
());
if
(
item
.
isInitial
())
{
textView
.
setText
(
ctx
.
getString
(
R
.
string
.
groups_member_created
,
item
.
getAuthor
().
getName
()
));
textView
.
setText
(
ctx
.
getString
(
R
.
string
.
groups_member_created
,
name
));
}
else
{
if
(
item
.
getAuthorInfo
().
getStatus
()
==
OURSELVES
)
{
textView
.
setText
(
R
.
string
.
groups_member_joined_you
);
}
else
{
textView
.
setText
(
ctx
.
getString
(
R
.
string
.
groups_member_joined
,
item
.
getAuthor
().
getName
()
));
textView
.
setText
(
ctx
.
getString
(
R
.
string
.
groups_member_joined
,
name
));
}
}
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java
View file @
fb2c321a
package
org.briarproject.briar.android.privategroup.memberlist
;
import
android.content.Context
;
import
android.support.annotation.NonNull
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -8,6 +9,8 @@ import android.view.ViewGroup;
import
org.briarproject.briar.R
;
import
org.briarproject.briar.android.util.BriarAdapter
;
import
static
org
.
briarproject
.
briar
.
android
.
util
.
UiUtils
.
getContactDisplayName
;
class
MemberListAdapter
extends
BriarAdapter
<
MemberListItem
,
MemberListItemHolder
>
{
...
...
@@ -15,8 +18,9 @@ class MemberListAdapter extends
super
(
context
,
MemberListItem
.
class
);
}
@NonNull
@Override
public
MemberListItemHolder
onCreateViewHolder
(
ViewGroup
viewGroup
,
public
MemberListItemHolder
onCreateViewHolder
(
@NonNull
ViewGroup
viewGroup
,
int
i
)
{
View
v
=
LayoutInflater
.
from
(
ctx
).
inflate
(
R
.
layout
.
list_item_group_member
,
viewGroup
,
false
);
...
...
@@ -24,13 +28,18 @@ class MemberListAdapter extends
}
@Override
public
void
onBindViewHolder
(
MemberListItemHolder
ui
,
int
position
)
{
public
void
onBindViewHolder
(
@NonNull
MemberListItemHolder
ui
,
int
position
)
{
ui
.
bind
(
items
.
get
(
position
));
}
@Override
public
int
compare
(
MemberListItem
m1
,
MemberListItem
m2
)
{
return
m1
.
getMember
().
getName
().
compareTo
(
m2
.
getMember
().
getName
());
String
n1
=
getContactDisplayName
(
m1
.
getMember
(),
m1
.
getAuthorInfo
().
getAlias
());
String
n2
=
getContactDisplayName
(
m2
.
getMember
(),
m2
.
getAuthorInfo
().
getAlias
());
return
n1
.
compareTo
(
n2
);
}
@Override
...
...
briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java
View file @
fb2c321a
...
...
@@ -13,6 +13,7 @@ import org.briarproject.briar.android.view.AuthorView;
import
static
android
.
view
.
View
.
GONE
;
import
static
android
.
view
.
View
.
VISIBLE
;
import
static
org
.
briarproject
.
bramble
.
api
.
identity
.
AuthorInfo
.
Status
.
OURSELVES
;
import
static
org
.
briarproject
.
briar
.
android
.
util
.
UiUtils
.
getContactDisplayName
;
@UiThread
@NotNullByDefault
...
...
@@ -51,9 +52,10 @@ class MemberListItemHolder extends RecyclerView.ViewHolder {
if
(
item
.
getStatus
()
==
OURSELVES
)
{
creator
.
setText
(
R
.
string
.
groups_member_created_you
);
}
else
{
String
name
=
getContactDisplayName
(
item
.
getMember
(),
item
.
getAuthorInfo
().
getAlias
());
creator
.
setText
(
creator
.
getContext
()
.
getString
(
R
.
string
.
groups_member_created
,
item
.
getMember
().
getName
()));
.
getString
(
R
.
string
.
groups_member_created
,
name
));
}
}
else
{
creator
.
setVisibility
(
GONE
);
...
...
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