Skip to content

Show username in full account name #4338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ezaquarii wants to merge 1 commit into from
Closed

Show username in full account name #4338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/main/java/com/owncloud/android/utils/DisplayUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,10 @@ public static String convertIdn(String url, boolean toASCII) {
public static String getAccountNameDisplayText(Context context, Account savedAccount, String accountName, String
fallbackString) {
try {
return new OwnCloudAccount(savedAccount, context).getDisplayName()
+ "@"
+ convertIdn(accountName.substring(accountName.lastIndexOf('@') + 1), false);
final OwnCloudAccount account = new OwnCloudAccount(savedAccount, context);
final String username = account.getCredentials().getUsername();
final String domain = convertIdn(accountName.substring(accountName.lastIndexOf('@') + 1), false);
return String.format("%s@%s", username, domain);
} catch (Exception e) {
Log_OC.w(TAG, "Couldn't get display name for account, using old style");
return fallbackString;
Expand Down