From 162fcb47bc1dbce9ce1ba489168bfc19a5fa5dee Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 8 Jan 2017 11:23:37 +0800 Subject: [PATCH] Fix #1066 --- .../com/github/shadowsocks/acl/CustomRulesFragment.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala b/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala index 7b2bcc8b..1160e3f7 100644 --- a/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala +++ b/src/main/scala/com/github/shadowsocks/acl/CustomRulesFragment.scala @@ -64,7 +64,9 @@ class CustomRulesFragment extends ToolbarFragment with Toolbar.OnMenuItemClickLi private val handler = new Handler() private val selectedItems = new mutable.HashSet[AnyRef] - private def onSelectedItemsUpdated(): Unit = selectionItem.setVisible(selectedItems.nonEmpty) + private def onSelectedItemsUpdated(): Unit = if (selectionItem != null) { + selectionItem.setVisible(selectedItems.nonEmpty) + } private final class AclRuleViewHolder(view: View) extends RecyclerView.ViewHolder(view) with View.OnClickListener with View.OnLongClickListener { @@ -232,6 +234,7 @@ class CustomRulesFragment extends ToolbarFragment with Toolbar.OnMenuItemClickLi toolbar.inflateMenu(R.menu.custom_rules_menu) toolbar.setOnMenuItemClickListener(this) selectionItem = toolbar.getMenu.findItem(R.id.selection) + selectionItem.setVisible(selectedItems.nonEmpty) list = view.findViewById(R.id.list).asInstanceOf[RecyclerView] list.setLayoutManager(new LinearLayoutManager(getActivity, LinearLayoutManager.VERTICAL, false)) list.setItemAnimator(new DefaultItemAnimator)