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
675
Issues
675
List
Boards
Labels
Service Desk
Milestones
Merge Requests
11
Merge Requests
11
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
ecf417c9
Verified
Commit
ecf417c9
authored
Oct 31, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[android] Show contact alias in remaining places
parent
c1785c5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
...iar/android/introduction/IntroductionMessageFragment.java
+3
-2
briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java
...id/privategroup/invitation/GroupInvitationViewHolder.java
+3
-1
briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java
...roid/privategroup/reveal/RevealableContactViewHolder.java
+2
-1
briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingInvitationViewHolder.java
...ct/briar/android/sharing/SharingInvitationViewHolder.java
+3
-1
No files found.
briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
View file @
ecf417c9
...
@@ -38,6 +38,7 @@ import static android.view.View.VISIBLE;
...
@@ -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
...
@@ -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
);
...
...
briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java
View file @
ecf417c9
...
@@ -9,6 +9,8 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem;
...
@@ -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
...
@@ -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
()
)));
}
}
}
}
\ No newline at end of file
briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java
View file @
ecf417c9
...
@@ -14,6 +14,7 @@ import javax.annotation.Nullable;
...
@@ -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
...
@@ -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
...
...
briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingInvitationViewHolder.java
View file @
ecf417c9
...
@@ -13,6 +13,8 @@ import java.util.Collection;
...
@@ -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
...
@@ -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
,
", "
)));
...
...
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