2 files changed, 128 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java b/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java
new file mode 100644
index 0000000..123469c
--- /dev/null
+++ b/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java
@@ -0,0 +1,71 @@
+package cgeo.geocaching.search;
+
+import org.apache.commons.lang3.StringUtils;
+
+import rx.util.functions.Func1;
+
+import android.content.Context;
+import android.widget.ArrayAdapter;
+import android.widget.Filter;
+
+/**
+ * The standard auto completion only matches user input at word boundaries. Therefore searching "est" will not match
+ * "test". This adapter matches everywhere.
+ *
+ */
+public class AutoCompleteAdapter extends ArrayAdapter<String> {
+
+    private String[] suggestions;
+    private final Func1<String, String[]> suggestionFunction;
+
+    public AutoCompleteAdapter(Context context, int textViewResourceId, final Func1<String, String[]> suggestionFunction) {
+        super(context, textViewResourceId);
+        this.suggestionFunction = suggestionFunction;
+    }
+
+    @Override
+    public int getCount() {
+        return suggestions.length;
+    }
+
+    @Override
+    public String getItem(int index) {
+        return suggestions[index];
+    }
+
+    @Override
+    public Filter getFilter() {
+        Filter filter = new Filter() {
+
+            @Override
+            protected FilterResults performFiltering(CharSequence constraint) {
+                FilterResults filterResults = new FilterResults();
+                if (constraint == null) {
+                    return filterResults;
+                }
+                String trimmed = StringUtils.trim(constraint.toString());
+                if (StringUtils.length(trimmed) >= 2) {
+                    String[] newResults = suggestionFunction.call(trimmed);
+
+                    // Assign the data to the FilterResults, but do not yet store in the global member.
+                    // Otherwise we might invalidate the adapter and cause an IllegalStateException.
+                    filterResults.values = newResults;
+                    filterResults.count = newResults.length;
+                }
+                return filterResults;
+            }
+
+            @Override
+            protected void publishResults(CharSequence constraint, FilterResults filterResults) {
+                if (filterResults != null && filterResults.count > 0) {
+                    suggestions = (String[]) filterResults.values;
+                    notifyDataSetChanged();
+                }
+                else {
+                    notifyDataSetInvalidated();
+                }
+            }
+        };
+        return filter;
+    }
+}
+\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/search/SuggestionProvider.java b/main/src/cgeo/geocaching/search/SuggestionProvider.java
new file mode 100644
index 0000000..c0a7728
--- /dev/null
+++ b/main/src/cgeo/geocaching/search/SuggestionProvider.java
@@ -0,0 +1,57 @@
+package cgeo.geocaching.search;
+
+import cgeo.geocaching.DataStore;
+
+import org.apache.commons.lang3.StringUtils;
+
+import android.app.SearchManager;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class SuggestionProvider extends ContentProvider {
+
+    private static Cursor lastCursor;
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public String getType(final Uri arg0) {
+        return SearchManager.SUGGEST_MIME_TYPE;
+    }
+
+    @Override
+    public Cursor query(final Uri uri, final String[] projection, final String selection, final String[] selectionArgs, final String sortOrder) {
+        final String searchTerm = uri.getLastPathSegment();
+        // can be empty when deleting the query
+        if (StringUtils.equals(searchTerm, SearchManager.SUGGEST_URI_PATH_QUERY)) {
+            return lastCursor;
+        }
+        return getSuggestions(searchTerm);
+    }
+
+    private static Cursor getSuggestions(final String searchTerm) {
+        lastCursor = DataStore.findSuggestions(searchTerm);
+        return lastCursor;
+    }
+
+    @Override
+    public int delete(final Uri uri, final String selection, final String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Uri insert(final Uri uri, final ContentValues values) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int update(final Uri uri, final ContentValues values, final String selection, final String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+
+}