mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-06 15:18:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AbstractHafasClientInterfaceProvider: handle case of empty currency code when parsing fares

Browse source
This commit is contained in:
Andreas Schildbach 2021-10-17 22:20:53 +02:00
parent fca02d58b3
commit 0c058ebda0
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -774,7 +774,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
final JSONObject jsonTicket = jsonFare.getJSONArray("ticketL").getJSONObject(ticketX);
final String ticketName = jsonTicket.getString("name");
final String currencyStr = jsonTicket.getString("cur");
if (currencyStr != null) {
if (!Strings.isNullOrEmpty(currencyStr)) {
final Currency currency = Currency.getInstance(currencyStr);
final float price = jsonTicket.getInt("prc") / 100f;
fare = new Fare(normalizeFareName(fareName) + '\n' + ticketName,
@ -784,7 +784,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
}
} else if (type.equals("F")) { // fare
final String currencyStr = jsonFare.optString("cur");
if (currencyStr != null) {
if (!Strings.isNullOrEmpty(currencyStr)) {
final Currency currency = ParserUtils.getCurrency(currencyStr);
final float price = jsonFare.getInt("prc") / 100f;
fare = new Fare(normalizeFareName(fareName), normalizeFareType(fareName), currency,