浏览代码

don't show the currently active account in the account chooser (since it is already active and displayer in the drawer header)

- don't show information twice
Andy Scherzinger 8 年之前
父节点
当前提交
67940c57b2
共有 1 个文件被更改,包括 13 次插入10 次删除
  1. 13 10
      src/com/owncloud/android/ui/activity/DrawerActivity.java

+ 13 - 10
src/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -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(