Handle null values in callback (#61)

* Gradle version 2.2.3

* Handle null values in suggest callback

Author: sarahcodes100

lib/src/main/java/com/mapzen/pelias/widget/PeliasSearchView.java

@@ -85,6 +85,33 @@ public void run() {
   private boolean cacheSearchResults = true;
   private boolean autoKeyboardShow = true;
 
+  private Callback<Result> suggestCallback = new Callback<Result>() {
+    @Override public void onResponse(Call<Result> call, Response<Result> response) {
+      final ArrayList<AutoCompleteItem> items = new ArrayList<>();
+      if (response != null && response.body() != null) {
+        final List<Feature> features = response.body().getFeatures();
+        if (features != null) {
+          for (Feature feature : features) {
+            items.add(new AutoCompleteItem(SimpleFeature.fromFeature(feature)));
+          }
+        }
+      }
+
+      if (autoCompleteListView == null) {
+        return;
+      }
+
+      final AutoCompleteAdapter adapter = (AutoCompleteAdapter) autoCompleteListView.getAdapter();
+      adapter.clear();
+      adapter.addAll(items);
+      adapter.notifyDataSetChanged();
+    }
+
+    @Override public void onFailure(Call<Result> call, Throwable t) {
+      Log.e(TAG, "Unable to fetch autocomplete results", t);
+    }
+  };
+
   /**
    * Constructs a new search view given a context.
    */
@@ -235,28 +262,7 @@ private void fetchAutoCompleteSuggestions(String text) {
       return;
     }
 
-    pelias.suggest(text, new Callback<Result>() {
-      @Override public void onResponse(Call<Result> call, Response<Result> response) {
-        final ArrayList<AutoCompleteItem> items = new ArrayList<>();
-        final List<Feature> features = response.body().getFeatures();
-        for (Feature feature : features) {
-          items.add(new AutoCompleteItem(SimpleFeature.fromFeature(feature)));
-        }
-
-        if (autoCompleteListView == null) {
-          return;
-        }
-
-        final AutoCompleteAdapter adapter = (AutoCompleteAdapter) autoCompleteListView.getAdapter();
-        adapter.clear();
-        adapter.addAll(items);
-        adapter.notifyDataSetChanged();
-      }
-
-      @Override public void onFailure(Call<Result> call, Throwable t) {
-        Log.e(TAG, "Unable to fetch autocomplete results", t);
-      }
-    });
+    pelias.suggest(text, suggestCallback);
   }
 
   /**
@@ -511,4 +517,8 @@ private void updateSavedSearch() {
       }
     }, 150);
   }
+
+  Callback<Result> getSuggestCallback() {
+    return suggestCallback;
+  }
 }

lib/src/test/java/com/mapzen/pelias/widget/PeliasSearchViewTest.java

@@ -25,6 +25,8 @@
 import android.widget.TextView;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.HashSet;
 
 import okhttp3.Request;
 import static org.fest.assertions.api.Assertions.assertThat;
@@ -176,6 +178,20 @@ public class PeliasSearchViewTest {
     assertThat(callback.error).isNull();
   }
 
+  @Test public void onQueryTextSubmit_shouldHandleNullBody() throws Exception {
+    final AutoCompleteListView listView = new AutoCompleteListView(ACTIVITY);
+    final TestEmptyAdapter adapter = new TestEmptyAdapter();
+    listView.setAdapter(adapter);
+    peliasSearchView.setAutoCompleteListView(listView);
+    final Pelias pelias = new TestEmptyPelias();
+    final Callback<Result> callback = peliasSearchView.getSuggestCallback();
+    pelias.setLocationProvider(new PeliasTest.TestLocationProvider());
+    peliasSearchView.setPelias(pelias);
+    peliasSearchView.setCallback(callback);
+    peliasSearchView.setQuery("query", true);
+    assertThat(adapter.getCount()).isEqualTo(0);
+  }
+
   @Test public void onItemClick_shouldSetQuery() throws Exception {
     final AutoCompleteListView listView = new AutoCompleteListView(ACTIVITY);
     listView.setAdapter(new TestAdapter());
@@ -348,6 +364,90 @@ private class TestCall implements Call<Result> {
     }
   }
 
+  private class TestEmptyPelias extends Pelias {
+    protected TestEmptyPelias() {
+      super(new TestEmptyPeliasService());
+    }
+  }
+
+  private class TestEmptyPeliasService implements PeliasService {
+    @Override public Call<Result> getSuggest(@Query("text") String query,
+        @Query("focus.point.lat") double lat, @Query("focus.point.lon") double lon) {
+      return new TestEmptyCall();
+    }
+
+    @Override public Call<Result> getSearch(@Query("text") String query,
+        @Query("focus.viewport.min_lon") double minLon,
+        @Query("focus.viewport.min_lat") double minLat,
+        @Query("focus.viewport.max_lon") double maxLon,
+        @Query("focus.viewport.max_lat") double maxLat) {
+      return new TestEmptyCall();
+    }
+
+    @Override public Call<Result> getSearch(@Query("text") String query,
+        @Query("focus.point.lat") double lat, @Query("focus.point.lon") double lon) {
+      return new TestEmptyCall();
+    }
+
+    @Override public Call<Result> getReverse(@Query("point.lat") double lat,
+        @Query("point.lon") double lon) {
+      return new TestEmptyCall();
+    }
+
+    @Override public Call<Result> getPlace(@Query("ids") String ids) {
+      return new TestEmptyCall();
+    }
+  }
+
+  private class TestEmptyCall implements Call<Result> {
+    @Override public Response<Result> execute() throws IOException {
+      return Response.success(null);
+    }
+
+    @Override public void enqueue(Callback<Result> callback) {
+      callback.onResponse(null, null);
+    }
+
+    @Override public boolean isExecuted() {
+      return false;
+    }
+
+    @Override public void cancel() {
+    }
+
+    @Override public boolean isCanceled() {
+      return false;
+    }
+
+    @Override public Call<Result> clone() {
+      return null;
+    }
+
+    @Override public Request request() {
+      return null;
+    }
+  }
+
+  private class TestEmptyAdapter extends AutoCompleteAdapter {
+    Collection<? extends AutoCompleteItem> items = new HashSet<>();
+
+    public TestEmptyAdapter() {
+      super(ACTIVITY, android.R.layout.simple_list_item_1);
+    }
+
+    @Override public void addAll(Collection<? extends AutoCompleteItem> collection) {
+      this.items = collection;
+    }
+
+    @Override public AutoCompleteItem getItem(int position) {
+      return new AutoCompleteItem("query");
+    }
+
+    @Override public int getCount() {
+      return items.size();
+    }
+  }
+
   private class TestCallback implements Callback<Result> {
     private Result result;
     private Throwable error;