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

Fixed NullPointerException

Browse Source
This commit is contained in:
dkeen@dkeen-laptop 2012-04-24 16:13:23 -07:00
parent ec71764aad
commit 742837f654
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dougkeen.bart" package="com.dougkeen.bart"
android:versionCode="14" android:versionCode="15"
android:versionName="1.2.1" > android:versionName="1.2.2" >
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />

4
src/com/dougkeen/bart/model/Departure.java
View File

@ -326,7 +326,7 @@ public class Departure implements Parcelable, Comparable<Departure> {
} }
private int getEqualsTolerance() { private int getEqualsTolerance() {
if (origin.longStationLinger && hasDeparted()) { if (origin != null && origin.longStationLinger && hasDeparted()) {
return ESTIMATE_EQUALS_TOLERANCE_LONG_LINGER_MILLIS; return ESTIMATE_EQUALS_TOLERANCE_LONG_LINGER_MILLIS;
} else { } else {
return ESTIMATE_EQUALS_TOLERANCE_MILLIS; return ESTIMATE_EQUALS_TOLERANCE_MILLIS;
@ -337,7 +337,7 @@ public class Departure implements Parcelable, Comparable<Departure> {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
int secondsLeft = getMeanSecondsLeft(); int secondsLeft = getMeanSecondsLeft();
if (hasDeparted()) { if (hasDeparted()) {
if (origin.longStationLinger && beganAsDeparted) { if (origin != null && origin.longStationLinger && beganAsDeparted) {
builder.append("At station"); builder.append("At station");
} else { } else {
builder.append("Departed"); builder.append("Departed");