|
@@ -432,16 +432,19 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
|
|
|
// add all accounts to list
|
|
|
for (int i = 0; i < accounts.length; i++) {
|
|
|
try {
|
|
|
- MenuItem accountMenuItem = mNavigationView.getMenu().add(
|
|
|
- R.id.drawer_menu_accounts,
|
|
|
- Menu.NONE,
|
|
|
- MENU_ORDER_ACCOUNT,
|
|
|
- accounts[i].name)
|
|
|
- .setIcon(TextDrawable.createAvatar(
|
|
|
- accounts[i].name,
|
|
|
- mMenuAccountAvatarRadiusDimension)
|
|
|
- );
|
|
|
- DisplayUtils.setAvatar(accounts[i], this, mMenuAccountAvatarRadiusDimension, getResources(), getStorageManager(), accountMenuItem);
|
|
|
+ // show all accounts except the currently active one
|
|
|
+ if (!getAccount().name.equals(accounts[i].name)) {
|
|
|
+ MenuItem accountMenuItem = mNavigationView.getMenu().add(
|
|
|
+ R.id.drawer_menu_accounts,
|
|
|
+ Menu.NONE,
|
|
|
+ MENU_ORDER_ACCOUNT,
|
|
|
+ accounts[i].name)
|
|
|
+ .setIcon(TextDrawable.createAvatar(
|
|
|
+ accounts[i].name,
|
|
|
+ mMenuAccountAvatarRadiusDimension)
|
|
|
+ );
|
|
|
+ DisplayUtils.setAvatar(accounts[i], this, mMenuAccountAvatarRadiusDimension, getResources(), getStorageManager(), accountMenuItem);
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
Log_OC.e(TAG, "Error calculating RGB value for account menu item.", e);
|
|
|
mNavigationView.getMenu().add(
|