tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaning results on location change.

master
Tomasz Półgrabia 2016-10-04 21:00:30 +02:00
parent 94d57f6c46
commit c2be3b194f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java
View File

@ -14,7 +14,6 @@ import pl.tpolgrabia.googleutils.dto.GooglePlaceResult;
import pl.tpolgrabia.urbanexplorer.AppConstants; import pl.tpolgrabia.urbanexplorer.AppConstants;
import pl.tpolgrabia.urbanexplorer.MainActivity; import pl.tpolgrabia.urbanexplorer.MainActivity;
import pl.tpolgrabia.urbanexplorer.R; import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesResponse;
import java.util.List; import java.util.List;

18
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
View File

@ -8,7 +8,6 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ListAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
@ -50,7 +49,7 @@ public class PlacesFragment extends Fragment {
private List<GooglePlaceResult> places = new ArrayList<>(); private List<GooglePlaceResult> places = new ArrayList<>();
private Semaphore semaphore = new Semaphore(1); private Semaphore semaphore = new Semaphore(1);
private boolean finished = false; private boolean noMoreResults = false;
public PlacesFragment() { public PlacesFragment() {
// Required empty public constructor // Required empty public constructor
@ -91,7 +90,10 @@ public class PlacesFragment extends Fragment {
return; return;
} }
fetchNearbyPlacesAndPresemt(location); places = null;
nextPageToken = null;
noMoreResults = false;
fetchNearbyPlacesAndPresent(location);
} }
}); });
@ -116,7 +118,7 @@ public class PlacesFragment extends Fragment {
return; return;
} }
fetchNearbyPlacesAndPresemt(location); fetchNearbyPlacesAndPresent(location);
} }
}); });
@ -152,11 +154,11 @@ public class PlacesFragment extends Fragment {
} }
}); });
lg.debug("Fetching nearby places {}", location); lg.debug("Fetching nearby places {}", location);
fetchNearbyPlacesAndPresemt(location); fetchNearbyPlacesAndPresent(location);
} }
private void fetchNearbyPlacesAndPresemt(Location location) { private void fetchNearbyPlacesAndPresent(Location location) {
if (!semaphore.tryAcquire()) { if (!semaphore.tryAcquire()) {
// running // running
return; return;
@ -176,7 +178,7 @@ public class PlacesFragment extends Fragment {
return; return;
} }
if (finished) { if (noMoreResults) {
semaphore.release(); semaphore.release();
return; return;
} }
@ -215,7 +217,7 @@ public class PlacesFragment extends Fragment {
nextPageToken = response.getNextPageToken(); nextPageToken = response.getNextPageToken();
if (nextPageToken == null) { if (nextPageToken == null) {
finished = true; noMoreResults = true;
} }
semaphore.release(); semaphore.release();
} }