Merge pull request #3948 from nextcloud/idnString

Showing Unicode encoded IDN strings in drawer navigation

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -702,13 +702,13 @@ public abstract class DrawerActivity extends ToolbarActivity
 
                 if (!getAccount().name.equals(account.name)) {
                     MenuItem accountMenuItem = mNavigationView.getMenu().add(
-                            R.id.drawer_menu_accounts,
-                            Menu.NONE,
-                            MENU_ORDER_ACCOUNT,
-                            account.name)
-                            .setIcon(TextDrawable.createAvatar(account, mMenuAccountAvatarRadiusDimension));
+                        R.id.drawer_menu_accounts,
+                        Menu.NONE,
+                        MENU_ORDER_ACCOUNT,
+                        DisplayUtils.getAccountNameDisplayText(this, account, account.name, account.name))
+                        .setIcon(TextDrawable.createAvatar(account, mMenuAccountAvatarRadiusDimension));
                     DisplayUtils.setAvatar(account, this, mMenuAccountAvatarRadiusDimension, getResources(),
-                            accountMenuItem, this);
+                                           accountMenuItem, this);
                 }
             } catch (Exception e) {
                 Log_OC.e(TAG, "Error calculating RGB value for account menu item.", e);
@@ -716,7 +716,7 @@ public abstract class DrawerActivity extends ToolbarActivity
                         R.id.drawer_menu_accounts,
                         Menu.NONE,
                         MENU_ORDER_ACCOUNT,
-                        account.name)
+                        DisplayUtils.getAccountNameDisplayText(this, account, account.name, account.name))
                     .setIcon(R.drawable.ic_user);
             }
         }
@@ -765,8 +765,10 @@ public abstract class DrawerActivity extends ToolbarActivity
         if (mDrawerLayout != null && account != null) {
             TextView username = (TextView) findNavigationViewChildById(R.id.drawer_username);
             TextView usernameFull = (TextView) findNavigationViewChildById(R.id.drawer_username_full);
-            usernameFull.setText(account.name);
+
+            usernameFull.setText(DisplayUtils.getAccountNameDisplayText(this, account, account.name, account.name));
             usernameFull.setTextColor(ThemeUtils.fontColor(this));
+
             try {
                 OwnCloudAccount oca = new OwnCloudAccount(account, this);
                 username.setText(oca.getDisplayName());