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

Google places duplicated items issue fixed.

master
Tomasz Półgrabia 2016-10-05 20:28:05 +02:00
parent 203774e24f
commit 21854fee7e
3 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/wiki/WikiFetchAppDataCallback.java
View File

@ -4,9 +4,11 @@ import android.support.v4.app.FragmentActivity;
import android.widget.ListView;
import android.widget.Toast;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import pl.tpolgrabia.urbanexplorer.MainActivity;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.adapters.WikiLocationsAdapter;
import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
import pl.tpolgrabia.wikibinding.callback.WikiStatus;
import pl.tpolgrabia.wikibinding.dto.app.WikiAppObject;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent;
@ -57,4 +59,5 @@ public class WikiFetchAppDataCallback implements WikiAppResponseCallback {
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
}
}

10
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesState.java
View File

@ -12,6 +12,7 @@ public class GooglePlacesState {
private List<GooglePlaceResult> places;
private String nextPageToken;
private boolean noMoreResults;
private Long pageId;
public void setPlaces(List<GooglePlaceResult> places) {
this.places = places;
@ -37,12 +38,21 @@ public class GooglePlacesState {
return noMoreResults;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public Long getPageId() {
return pageId;
}
@Override
public String toString() {
return "GooglePlacesState{" +
"places=" + places +
", nextPageToken='" + nextPageToken + '\'' +
", noMoreResults=" + noMoreResults +
", pageId=" + pageId +
'}';
}
}

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

@ -32,6 +32,7 @@ import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesState;
import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesScrollListener;
import pl.tpolgrabia.urbanexplorer.worker.GooglePlacesWorker;
import pl.tpolgrabia.urbanexplorerutils.callbacks.StandardLocationListenerCallback;
import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
import java.io.*;
@ -50,6 +51,7 @@ public class PlacesFragment extends Fragment {
private PlacesUtils placesUtils;
private GeocoderUtils geocoderUtils;
private String nextPageToken;
private Long pageId = 0L;
private List<GooglePlaceResult> places = new ArrayList<>();
private Semaphore semaphore = new Semaphore(1);
@ -97,6 +99,7 @@ public class PlacesFragment extends Fragment {
places = null;
nextPageToken = null;
noMoreResults = false;
pageId = 0L;
fetchNearbyPlacesAndPresent(location);
}
@ -128,23 +131,38 @@ public class PlacesFragment extends Fragment {
});
geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY);
try (BufferedReader br = new BufferedReader(
BufferedReader br = null;
try {
br = new BufferedReader(
new InputStreamReader(
new FileInputStream(
new File(getActivity().getCacheDir(),
GooglePlacesConstants.GOOGLE_PLACES_CACHE_FILE))))) {
GooglePlacesConstants.GOOGLE_PLACES_CACHE_FILE))));
Gson g = new GsonBuilder().create();
GooglePlacesState state = g.fromJson(br, GooglePlacesState.class);
places = state.getPlaces();
nextPageToken = state.getNextPageToken();
noMoreResults = state.isNoMoreResults();
pageId = state.getPageId();
if (places != null && !places.isEmpty()) {
ListView placesWidget = (ListView) getView().findViewById(R.id.google_places);
placesWidget.setAdapter(new PlacesAdapter(getActivity(), places));
}
} catch (FileNotFoundException e) {
// no cache, ok, it can happen
} catch (IOException e) {
lg.error("I/O error during reading cache file", e);
} finally {
if (br != null) {
try {
br.close();
} catch (IOException e) {
lg.error("I/O error", e);
}
}
}
}
@ -157,6 +175,8 @@ public class PlacesFragment extends Fragment {
return;
}
getActivity().setTitle("Google places search");
Location location = LocationUtils.getLastKnownLocation(getActivity());
if (location == null) {
return;
@ -227,7 +247,9 @@ public class PlacesFragment extends Fragment {
@Subscribe
public void handleGooglePlacesResult(GooglePlacesResponse response) {
lg.debug("Handling google places results with original {} and next page token {}",
++pageId;
lg.debug("Page {}. Handling google places results with original {} and next page token {}",
pageId,
response.getOriginalPageToken(),
response.getNextPageToken());
@ -239,7 +261,7 @@ public class PlacesFragment extends Fragment {
} else {
places.addAll(response.getPlaces());
PlacesAdapter adapter = (PlacesAdapter)placesWidget.getAdapter();
adapter.addAll(places);
adapter.addAll(response.getPlaces());
}
nextPageToken = response.getNextPageToken();
@ -258,22 +280,40 @@ public class PlacesFragment extends Fragment {
state.setPlaces(places);
state.setNextPageToken(nextPageToken);
state.setNoMoreResults(noMoreResults);
state.setPageId(pageId);
Gson g = new GsonBuilder().create();
try (BufferedWriter bw = new BufferedWriter(
BufferedWriter bw = null;
try {
bw = new BufferedWriter(
new OutputStreamWriter(
new FileOutputStream(
new File(getActivity().getCacheDir(),
GooglePlacesConstants.GOOGLE_PLACES_CACHE_FILE))))) {
GooglePlacesConstants.GOOGLE_PLACES_CACHE_FILE))));
g.toJson(state, bw);
bw.close();
} catch (FileNotFoundException e) {
lg.error("File not found error during saving a state", e);
} catch (IOException e) {
lg.error("I/O error during saving a state");
} finally {
if (bw != null) {
try {
bw.close();
} catch (IOException e) {
lg.error("I/O Error", e);
}
}
}
}
@Subscribe
public void refresh(RefreshEvent event) {
places = null;
nextPageToken = null;
noMoreResults = false;
fetchNearbyPlacesAndPresent(LocationUtils.getLastKnownLocation(getActivity()));
}
}