From 3e2dce9bd757349bc9c13ea7ae4d39c353c7dc45 Mon Sep 17 00:00:00 2001 From: srowen Date: Thu, 26 Apr 2012 19:09:36 +0000 Subject: [PATCH] Issue 1256 Avoid crash clearing Empty message git-svn-id: https://zxing.googlecode.com/svn/trunk@2271 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../google/zxing/client/android/history/HistoryActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/src/com/google/zxing/client/android/history/HistoryActivity.java b/android/src/com/google/zxing/client/android/history/HistoryActivity.java index da0b054b5..a07db9862 100644 --- a/android/src/com/google/zxing/client/android/history/HistoryActivity.java +++ b/android/src/com/google/zxing/client/android/history/HistoryActivity.java @@ -81,7 +81,9 @@ public final class HistoryActivity extends ListActivity { View v, ContextMenu.ContextMenuInfo menuInfo) { int position = ((AdapterView.AdapterContextMenuInfo) menuInfo).position; - menu.add(Menu.NONE, position, position, R.string.history_clear_one_history_text); + if (position >= adapter.getCount() || adapter.getItem(position).getResult() != null) { + menu.add(Menu.NONE, position, position, R.string.history_clear_one_history_text); + } // else it's just that dummy "Empty" message } @Override