diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index 2becbed..c651aad 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -73,6 +73,9 @@ DSB|da-DK|DK;København # SE SE|sv-SE|SE;Stockholm +# FI +FINLAND|fi-FI|FI;Helsinki|beta + # GB TLEM|en-UK|GB;Greater London;Derbyshire;Leicestershire;Rutland;Northamptonshire;Nottinghamshire;Lincolnshire;Berkshire;Buckinghamshire;East Sussex;Hampshire;Isle of Wight;Kent;Oxfordshire;Surrey;West Sussex;Essex;Hertfordshire;Bedfordshire;Cambridgeshire;Norfolk;Suffolk;Somerset;Gloucestershire;Wiltshire;Dorset;Devon;Cornwall;West Devon;Stowford;Eastleigh;Swindon;Gloucester;Plymouth;Torbay;Bournemouth;Poole;Birmingham MERSEY|en-UK|GB;Liverpool|beta diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 3f4aec6..f9a0471 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -103,6 +103,8 @@ Fern-, Regional und Lokalverkehr (z.B. Kopenhagen) Schweden Fern-, Regional und Lokalverkehr (z.B. Stockholm) + Finnland + Fern-, Regional und Lokalverkehr (z.B. Helsinki) England, Schottland & Wales. Lokal- und Regionalverkehr (z.B. London, Birmingham) Liverpool diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index 1ed9b1c..d4069f8 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -104,6 +104,8 @@ long-distance, regional and local (e.g. Copenhagen) Sweden long-distance, regional and local (e.g. Stockholm) + Finland + long-distance, regional and local (e.g. Helsinki) England, Scotland & Wales local and regional (e.g. London, Birmingham) Liverpool diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index fe2957b..53bd07d 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -31,6 +31,7 @@ import de.schildbach.pte.CmtaProvider; import de.schildbach.pte.DingProvider; import de.schildbach.pte.DsbProvider; import de.schildbach.pte.DubProvider; +import de.schildbach.pte.FinlandProvider; import de.schildbach.pte.GvhProvider; import de.schildbach.pte.InvgProvider; import de.schildbach.pte.ItalyProvider; @@ -188,6 +189,8 @@ public final class NetworkProviderFactory { return new DsbProvider("{\"type\":\"AID\",\"aid\":\"irkmpm9mdznstenr-android\"}"); else if (networkId.equals(NetworkId.SE)) return new SeProvider("{\"type\":\"AID\",\"aid\":\"h5o3n7f4t2m8l9x1\"}"); + else if (networkId.equals(NetworkId.FINLAND)) + return new FinlandProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.TLEM)) return new TlemProvider(); else if (networkId.equals(NetworkId.MERSEY))