diff options
| -rw-r--r-- | main/src/cgeo/geocaching/CacheListActivity.java | 9 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/DataStore.java | 15 |
2 files changed, 16 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java index 8c3c374..abf79e3 100644 --- a/main/src/cgeo/geocaching/CacheListActivity.java +++ b/main/src/cgeo/geocaching/CacheListActivity.java @@ -1742,8 +1742,11 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA @Override public ShowcaseViewBuilder getShowcase() { - return new ShowcaseViewBuilder(this) - .setTarget(new ActionViewTarget(this, Type.SPINNER)) - .setContent(R.string.showcase_cachelist_title, R.string.showcase_cachelist_text); + if (mCacheListSpinnerAdapter != null) { + return new ShowcaseViewBuilder(this) + .setTarget(new ActionViewTarget(this, Type.SPINNER)) + .setContent(R.string.showcase_cachelist_title, R.string.showcase_cachelist_text); + } + return null; } } diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java index 7406116..b6503ab 100644 --- a/main/src/cgeo/geocaching/DataStore.java +++ b/main/src/cgeo/geocaching/DataStore.java @@ -3107,11 +3107,16 @@ public class DataStore { } public static String[] getSuggestions(final String table, final String column, final String input) { - final Cursor cursor = database.rawQuery("SELECT DISTINCT " + column - + " FROM " + table - + " WHERE " + column + " LIKE ?" - + " ORDER BY " + column + " COLLATE NOCASE ASC;", new String[] { getSuggestionArgument(input) }); - return cursorToColl(cursor, new LinkedList<String>(), GET_STRING_0).toArray(new String[cursor.getCount()]); + try { + final Cursor cursor = database.rawQuery("SELECT DISTINCT " + column + + " FROM " + table + + " WHERE " + column + " LIKE ?" + + " ORDER BY " + column + " COLLATE NOCASE ASC;", new String[] { getSuggestionArgument(input) }); + return cursorToColl(cursor, new LinkedList<String>(), GET_STRING_0).toArray(new String[cursor.getCount()]); + } catch (final RuntimeException e) { + Log.e("cannot get suggestions from " + table + "->" + column + " for input '" + input + "'", e); + return new String[0]; + } } public static String[] getSuggestionsOwnerName(final String input) { |