From 4c6c4fa79bbfbbf71fe699df85691889008fc550 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Sat, 25 Sep 2010 21:19:43 +0000 Subject: [PATCH] session expiry is an exception git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@203 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/OebbProvider.java | 6 +++--- src/de/schildbach/pte/QueryConnectionsResult.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 45e41b16..a0110aba 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -251,7 +251,7 @@ public class OebbProvider implements NetworkProvider if (mError.group(2) != null) return QueryConnectionsResult.INVALID_DATE; if (mError.group(3) != null) - return QueryConnectionsResult.SESSION_TIMEOUT; + throw new SessionExpiredException(); } List fromAddresses = null; @@ -301,7 +301,7 @@ public class OebbProvider implements NetworkProvider if (mError.group(2) != null) return QueryConnectionsResult.INVALID_DATE; if (mError.group(3) != null) - return QueryConnectionsResult.SESSION_TIMEOUT; + throw new SessionExpiredException(); } return queryConnections(uri, page); @@ -363,7 +363,7 @@ public class OebbProvider implements NetworkProvider if (mError.group(2) != null) return QueryConnectionsResult.INVALID_DATE; if (mError.group(3) != null) - return QueryConnectionsResult.SESSION_TIMEOUT; + throw new SessionExpiredException(); } // parse page diff --git a/src/de/schildbach/pte/QueryConnectionsResult.java b/src/de/schildbach/pte/QueryConnectionsResult.java index e23caa70..d3b06974 100644 --- a/src/de/schildbach/pte/QueryConnectionsResult.java +++ b/src/de/schildbach/pte/QueryConnectionsResult.java @@ -28,13 +28,12 @@ public final class QueryConnectionsResult implements Serializable { public enum Status { - OK, AMBIGUOUS, TOO_CLOSE, NO_CONNECTIONS, INVALID_DATE, SESSION_TIMEOUT; + OK, AMBIGUOUS, TOO_CLOSE, NO_CONNECTIONS, INVALID_DATE; } public static final QueryConnectionsResult TOO_CLOSE = new QueryConnectionsResult(Status.TOO_CLOSE, null, null, null); public static final QueryConnectionsResult NO_CONNECTIONS = new QueryConnectionsResult(Status.NO_CONNECTIONS, null, null, null); public static final QueryConnectionsResult INVALID_DATE = new QueryConnectionsResult(Status.INVALID_DATE, null, null, null); - public static final QueryConnectionsResult SESSION_TIMEOUT = new QueryConnectionsResult(Status.SESSION_TIMEOUT, null, null, null); public final Status status;