Null check the EditText's action.

jeffington · Dec 9, 2014 · f57d0a7 · f57d0a7
1 parent 2c7fcd4
commit f57d0a7
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/com/ideabag/playtunes/fragment/search/SearchFragment.java b/src/com/ideabag/playtunes/fragment/search/SearchFragment.java
@@ -121,21 +121,30 @@ public SearchFragment( String query ) {
 
 			@Override public boolean onEditorAction( TextView view, int actionId, KeyEvent event ) {
 
-				if ( actionId == EditorInfo.IME_ACTION_SEARCH || event.getKeyCode() == KeyEvent.KEYCODE_ENTER ) {
+				boolean mConsumed = false;
+				String query = mQueryTextView.getEditableText().toString();
+
+				if ( event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER ) {
+
+					setMediaID( query );
+
+					mConsumed = true;
+
+				} else if ( event != null && event.getAction() == KeyEvent.ACTION_DOWN ) {
 
-					setMediaID( mQueryTextView.getEditableText().toString() );
+					setMediaID( query );
 
-					return true;
+					mConsumed = true;
 
-				} else if ( event.getAction() == KeyEvent.ACTION_DOWN ) {
+				} else if ( actionId == EditorInfo.IME_ACTION_SEARCH ) {
 
-					android.util.Log.i( TAG, "key down");
+					setMediaID( query );
 
-					setMediaID( mQueryTextView.getEditableText().toString() );
+					mConsumed = true;
 
 				}
 
-				return false;
+				return mConsumed;
 
 			}