Merge pull request soarcn#82 from anatolyrc/master

follow Menu semantics when the item id does not exist
jiubadao · Aug 27, 2015 · 79a291b · 79a291b
2 parents 19163a1 + 16551fa
commit 79a291b
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/library/src/main/java/com/cocosw/bottomsheet/ActionMenu.java b/library/src/main/java/com/cocosw/bottomsheet/ActionMenu.java
@@ -184,7 +184,12 @@ private int findItemIndex(int id) {
     }
 
     public MenuItem findItem(int id) {
-        return mItems.get(findItemIndex(id));
+        final int index = findItemIndex(id);
+        if (index < 0) {
+            return null;
+        }
+
+        return mItems.get(index);
     }
 
     public MenuItem getItem(int index) {
@@ -258,7 +263,12 @@ public void removeGroup(int groupId) {
     }
 
     public void removeItem(int id) {
-        mItems.remove(findItemIndex(id));
+        final int index = findItemIndex(id);
+        if (index < 0) {
+            return;
+        }
+
+        mItems.remove(index);
     }
 
     public void setGroupCheckable(int group, boolean checkable,