iamthefij/BartRunnerAndroid
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always get cached boarded departure when processing an alarm (no matter how old)

Browse Source
This commit is contained in:
Doug Keen 2013-07-04 11:33:37 -07:00
parent d407db14bb
commit 016d6523cd
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -12,5 +12,6 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

11
src/com/dougkeen/bart/BartRunnerApplication.java
View File

@ -107,6 +107,10 @@ public class BartRunnerApplication extends Application {
}
public Departure getBoardedDeparture() {
return getBoardedDeparture(false);
}
public Departure getBoardedDeparture(boolean useOldCache) {
if (mBoardedDeparture == null) {
// see if there's a saved one
File cachedDepartureFile = new File(getCacheDir(), CACHE_FILE_NAME);
@ -123,11 +127,12 @@ public class BartRunnerApplication extends Application {
parcel.recycle();
/*
* Check if the cached one is relatively recent. If so,
* restore that to the application context
* Ooptionally check if the cached one is relatively recent.
* If so, restore that to the application context
*/
long now = System.currentTimeMillis();
if (lastBoardedDeparture.getEstimatedArrivalTime() >= now
if (useOldCache
|| lastBoardedDeparture.getEstimatedArrivalTime() >= now
- FIVE_MINUTES
|| lastBoardedDeparture.getMeanEstimate() >= now
- 2 * FIVE_MINUTES) {

2
src/com/dougkeen/bart/receivers/AlarmBroadcastReceiver.java
View File

@ -16,7 +16,7 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
BartRunnerApplication application = (BartRunnerApplication) context
.getApplicationContext();
final Departure boardedDeparture = application.getBoardedDeparture();
final Departure boardedDeparture = application.getBoardedDeparture(true);
if (boardedDeparture == null) {
// Nothing to notify about
return;