Fixed problem where estimated arrival wasn't updating for departures other than the first one.
This commit is contained in:
parent
37ca713d39
commit
62bd905f26
@ -124,6 +124,11 @@ public class FavoritesArrayAdapter extends ArrayAdapter<StationPair> {
|
|||||||
}
|
}
|
||||||
for (int i = 0; i < getCount(); i++) {
|
for (int i = 0; i < getCount(); i++) {
|
||||||
StationPair adapterItem = getItem(i);
|
StationPair adapterItem = getItem(i);
|
||||||
|
if (cursor.isAfterLast()) {
|
||||||
|
while (i < getCount()) {
|
||||||
|
remove(getItem(i));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
StationPair cursorItem = StationPair.createFromCursor(cursor);
|
StationPair cursorItem = StationPair.createFromCursor(cursor);
|
||||||
while (!cursorItem.equals(adapterItem)) {
|
while (!cursorItem.equals(adapterItem)) {
|
||||||
remove(adapterItem);
|
remove(adapterItem);
|
||||||
@ -136,11 +141,13 @@ public class FavoritesArrayAdapter extends ArrayAdapter<StationPair> {
|
|||||||
if (cursorItem.equals(adapterItem)
|
if (cursorItem.equals(adapterItem)
|
||||||
&& !cursorItem.fareEquals(adapterItem)) {
|
&& !cursorItem.fareEquals(adapterItem)) {
|
||||||
adapterItem.setFare(cursorItem.getFare());
|
adapterItem.setFare(cursorItem.getFare());
|
||||||
adapterItem.setFareLastUpdated(cursorItem.getFareLastUpdated());
|
adapterItem.setFareLastUpdated(cursorItem
|
||||||
|
.getFareLastUpdated());
|
||||||
notifyDataSetChanged();
|
notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
cursor.moveToNext();
|
cursor.moveToNext();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
while (!cursor.isAfterLast()) {
|
while (!cursor.isAfterLast()) {
|
||||||
add(StationPair.createFromCursor(cursor));
|
add(StationPair.createFromCursor(cursor));
|
||||||
cursor.moveToNext();
|
cursor.moveToNext();
|
||||||
|
@ -157,8 +157,9 @@ public class EtdService extends Service {
|
|||||||
protected void registerListener(EtdServiceListener listener,
|
protected void registerListener(EtdServiceListener listener,
|
||||||
boolean limitToFirstNonDeparted) {
|
boolean limitToFirstNonDeparted) {
|
||||||
mListeners.put(listener, true);
|
mListeners.put(listener, true);
|
||||||
if (!limitToFirstNonDeparted)
|
if (!limitToFirstNonDeparted) {
|
||||||
mLimitToFirstNonDeparted = false;
|
mLimitToFirstNonDeparted = false;
|
||||||
|
}
|
||||||
if (!mPendingEtdRequest) {
|
if (!mPendingEtdRequest) {
|
||||||
mStarted = true;
|
mStarted = true;
|
||||||
fetchLatestDepartures();
|
fetchLatestDepartures();
|
||||||
@ -578,6 +579,8 @@ public class EtdService extends Service {
|
|||||||
.getMeanEstimate()) {
|
.getMeanEstimate()) {
|
||||||
fetchLatestSchedule();
|
fetchLatestSchedule();
|
||||||
return;
|
return;
|
||||||
|
} else if (!lastDeparture.hasAnyArrivalEstimate()) {
|
||||||
|
applyScheduleInformation(mLatestScheduleInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user