From fd3a932957ed91f6a218c131f8a27e639ac103ca Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 31 Jan 2015 21:12:56 +0100 Subject: [PATCH] EFA: Fix parsing of empty in mobile trips query. --- enabler/src/de/schildbach/pte/AbstractEfaProvider.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index a8beffd1..47ad2dca 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1776,8 +1776,14 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider final String productName = n != null ? n : de; final String lineId = parseMobileDv(pp); - final String symbol = productNu.endsWith(" " + productName) ? productNu.substring(0, productNu.length() - productName.length() - 1) - : productNu; + final String symbol; + if (productName != null && productNu == null) + symbol = productName; + else if (productName != null && productNu.endsWith(" " + productName)) + symbol = productNu.substring(0, productNu.length() - productName.length() - 1); + else + symbol = productNu; + final String trainType; final String trainNum; final Matcher mSymbol = P_MOBILE_M_SYMBOL.matcher(symbol);