Changing how the EditorActionListener works.

milos192 · Feb 23, 2017 · 14362fb · 14362fb
1 parent 9e2eccd
commit 14362fb
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/library/src/main/java/com/seraphim/chips/ChipsView.java b/library/src/main/java/com/seraphim/chips/ChipsView.java
@@ -459,12 +459,15 @@ public void clicked(ChipEntry entry) {
 
     @Override
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-        if (chipsListener == null || !chipsListener.onEditorAction(v, actionId, event)) {
-            if (mode == Mode.ALL && !editText.getText().toString().isEmpty() && actionId == EditorInfo.IME_ACTION_DONE) {
-                ChipEntry entry = factory.createChip(editText.getText().toString());
-                editText.setText("");
-                addChip(entry);
-            }
+        if (mode == Mode.ALL && !editText.getText().toString().isEmpty() && actionId == EditorInfo.IME_ACTION_DONE) {
+            ChipEntry entry = factory.createChip(editText.getText().toString());
+            editText.setText("");
+            addChip(entry);
+        }
+        // The upper action can be disabled by setting the Mode, so there's no use in having another way to disable it (via returning false),
+        // and there is an added benefit from having the factory created Chip in the chips list.
+        if (chipsListener != null) {
+            chipsListener.onEditorAction(v, actionId, event);
         }
         return true;
     }