Fix #273 - When searching, always check if last known location is null

If it is, use the current region center instead. Searches are location-based in OBA server-side, so we need to feed the REST API a location.
OneBusAway · Jun 24, 2015 · 86c4722 · 86c4722
1 parent 2cca338
commit 86c4722
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/MySearchFragmentBase.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/MySearchFragmentBase.java
@@ -209,15 +209,11 @@ protected boolean isShortcutMode() {
 
     protected final Location getSearchCenter() {
         Activity act = getActivity();
-        Location result = null;
-        if (act instanceof MyTabActivityBase) {
-            MyTabActivityBase base = (MyTabActivityBase) act;
-            result = base.getSearchCenter();
-        }
-        if (result == null) {
-            result = Application.getLastKnownLocation(act, mGoogleApiClient);
+        Location location = Application.getLastKnownLocation(act, mGoogleApiClient);
+        if (location == null) {
+            location = LocationUtil.getDefaultSearchCenter();
         }
-        return result;
+        return location;
     }
 
     private final OnFocusChangeListener mOnQueryTextFocusChangeListener

diff --git a/onebusaway-android/src/main/java/org/onebusaway/android/ui/SearchResultsFragment.java b/onebusaway-android/src/main/java/org/onebusaway/android/ui/SearchResultsFragment.java
@@ -143,8 +143,11 @@ private void search() {
     @Override
     public Loader<SearchResponse> onCreateLoader(int id, Bundle args) {
         String query = args.getString(QUERY_TEXT);
-        return new MyLoader(getActivity(), query,
-                Application.getLastKnownLocation(getActivity(), mGoogleApiClient));
+        Location location = Application.getLastKnownLocation(getActivity(), mGoogleApiClient);
+        if (location == null) {
+            location = LocationUtil.getDefaultSearchCenter();
+        }
+        return new MyLoader(getActivity(), query, location);
     }
 
     @Override