Merge branch 'master' into 345-clear-storage-action

# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
#	app/src/main/res/values/strings.xml

1 files changed, 47 insertions, 42 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java
index 7ae2f9f1d..efddf5af6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java
@@ -108,53 +108,56 @@ public class DrawerMenuUtil {
             @NonNull T context,
             @NonNull Menu menu,
             @NonNull List<Board> boards,
-            boolean hasArchivedBoards) {
+            boolean hasArchivedBoards,
+            boolean currentServerVersionIsSupported) {
         SubMenu boardsMenu = menu.addSubMenu(R.string.simple_boards);
         int index = 0;
         for (Board board : boards) {
             MenuItem m = boardsMenu.add(Menu.NONE, index++, Menu.NONE, board.getTitle()).setIcon(ViewUtil.getTintedImageView(context, R.drawable.circle_grey600_36dp, "#" + board.getColor()));
-            if (board.isPermissionManage()) {
-                AppCompatImageButton contextMenu = new AppCompatImageButton(context);
-                contextMenu.setBackgroundDrawable(null);
-                contextMenu.setImageDrawable(ViewUtil.getTintedImageView(context, R.drawable.ic_menu, R.color.grey600));
-                contextMenu.setOnClickListener((v) -> {
-                    PopupMenu popup = new PopupMenu(context, contextMenu);
-                    popup.getMenuInflater().inflate(R.menu.navigation_context_menu, popup.getMenu());
-                    final int SHARE_BOARD_ID = -1;
-                    if (board.isPermissionShare()) {
-                        popup.getMenu().add(Menu.NONE, SHARE_BOARD_ID, 5, R.string.share_board);
-                    }
-                    popup.setOnMenuItemClickListener((MenuItem item) -> {
-                        final String editBoard = context.getString(R.string.edit_board);
-                        switch (item.getItemId()) {
-                            case SHARE_BOARD_ID:
-                                AccessControlDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), AccessControlDialogFragment.class.getSimpleName());
-                                return true;
-                            case R.id.edit_board:
-                                EditBoardDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), editBoard);
-                                return true;
-                            case R.id.manage_labels:
-                                ManageLabelsDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), editBoard);
-                                return true;
-                            case R.id.archive_board:
-                                context.onArchive(board);
-                                return true;
-                            case R.id.delete_board:
-                                DeleteBoardDialogFragment.newInstance(board).show(context.getSupportFragmentManager(), DeleteBoardDialogFragment.class.getCanonicalName());
-                                return true;
-                            default:
-                                return false;
+            if (currentServerVersionIsSupported) {
+                if (board.isPermissionManage()) {
+                    AppCompatImageButton contextMenu = new AppCompatImageButton(context);
+                    contextMenu.setBackgroundDrawable(null);
+                    contextMenu.setImageDrawable(ViewUtil.getTintedImageView(context, R.drawable.ic_menu, R.color.grey600));
+                    contextMenu.setOnClickListener((v) -> {
+                        PopupMenu popup = new PopupMenu(context, contextMenu);
+                        popup.getMenuInflater().inflate(R.menu.navigation_context_menu, popup.getMenu());
+                        final int SHARE_BOARD_ID = -1;
+                        if (board.isPermissionShare()) {
+                            popup.getMenu().add(Menu.NONE, SHARE_BOARD_ID, 5, R.string.share_board);
                         }
+                        popup.setOnMenuItemClickListener((MenuItem item) -> {
+                            final String editBoard = context.getString(R.string.edit_board);
+                            switch (item.getItemId()) {
+                                case SHARE_BOARD_ID:
+                                    AccessControlDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), AccessControlDialogFragment.class.getSimpleName());
+                                    return true;
+                                case R.id.edit_board:
+                                    EditBoardDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), editBoard);
+                                    return true;
+                                case R.id.manage_labels:
+                                    ManageLabelsDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), editBoard);
+                                    return true;
+                                case R.id.archive_board:
+                                    context.onArchive(board);
+                                    return true;
+                                case R.id.delete_board:
+                                    DeleteBoardDialogFragment.newInstance(board).show(context.getSupportFragmentManager(), DeleteBoardDialogFragment.class.getCanonicalName());
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        });
+                        popup.show();
                     });
-                    popup.show();
-                });
-                m.setActionView(contextMenu);
-            } else if (board.isPermissionShare()) {
-                AppCompatImageButton contextMenu = new AppCompatImageButton(context);
-                contextMenu.setBackgroundDrawable(null);
-                contextMenu.setImageDrawable(ViewUtil.getTintedImageView(context, R.drawable.ic_share_grey600_18dp, R.color.grey600));
-                contextMenu.setOnClickListener((v) -> AccessControlDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), AccessControlDialogFragment.class.getSimpleName()));
-                m.setActionView(contextMenu);
+                    m.setActionView(contextMenu);
+                } else if (board.isPermissionShare()) {
+                    AppCompatImageButton contextMenu = new AppCompatImageButton(context);
+                    contextMenu.setBackgroundDrawable(null);
+                    contextMenu.setImageDrawable(ViewUtil.getTintedImageView(context, R.drawable.ic_share_grey600_18dp, R.color.grey600));
+                    contextMenu.setOnClickListener((v) -> AccessControlDialogFragment.newInstance(board.getLocalId()).show(context.getSupportFragmentManager(), AccessControlDialogFragment.class.getSimpleName()));
+                    m.setActionView(contextMenu);
+                }
             }
         }
 
@@ -162,7 +165,9 @@ public class DrawerMenuUtil {
             boardsMenu.add(Menu.NONE, MENU_ID_ARCHIVED_BOARDS, Menu.NONE, R.string.archived_boards).setIcon(ViewUtil.getTintedImageView(context, R.drawable.ic_archive_white_24dp, R.color.grey600));
         }
 
-        boardsMenu.add(Menu.NONE, MENU_ID_ADD_BOARD, Menu.NONE, R.string.add_board).setIcon(R.drawable.ic_add_grey_24dp);
+        if (currentServerVersionIsSupported) {
+            boardsMenu.add(Menu.NONE, MENU_ID_ADD_BOARD, Menu.NONE, R.string.add_board).setIcon(R.drawable.ic_add_grey_24dp);
+        }
 
         menu.add(Menu.NONE, MENU_ID_SETTINGS, Menu.NONE, R.string.simple_settings).setIcon(R.drawable.ic_settings_grey600_24dp);
         menu.add(Menu.NONE, MENU_ID_ABOUT, Menu.NONE, R.string.about).setIcon(R.drawable.ic_info_outline_grey600_24dp);