Skip to content

Commit

Permalink
update PTE (fixes NPE in AbstractNavitiaProvider)
Browse files Browse the repository at this point in the history
* removed MET according to changes in PTE dee663ea54d818b2d58d22cf4d16c54746e4aa5b
* adapted pre-build.sh to these changes
* remove English strings
  • Loading branch information
patkan authored and grote committed Jan 20, 2017
1 parent 74e4dc3 commit bd650fb
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 24 deletions.
2 changes: 1 addition & 1 deletion pre-build.sh
Expand Up @@ -3,5 +3,5 @@
# PTE: add non-upstream providers
cd sublibs/public-transport-enabler/enabler
git checkout -- src/de/schildbach/pte/NetworkId.java
sed -i "s#SYDNEY, MET#SYDNEY, NZ, SPAIN, BR, BRFLORIPA, MET#" src/de/schildbach/pte/NetworkId.java
sed -i "s#ONTARIO, QUEBEC#ONTARIO, NZ, SPAIN, BR, BRFLORIPA, QUEBEC#" src/de/schildbach/pte/NetworkId.java

2 changes: 0 additions & 2 deletions res/values/strings.xml
Expand Up @@ -185,8 +185,6 @@ there are any).</string>
<string name="changelog_show_full">More…</string>

<string name="np_region_australia">Australia</string>
<string name="np_name_met" translatable="false">PTV</string>
<string name="np_desc_met">Australia, Victoria, Melbourne</string>
<string name="np_name_sydney" translatable="false">Transport NSW</string>
<string name="np_desc_sydney">Australia, New South Wales, Sydney</string>

Expand Down
14 changes: 0 additions & 14 deletions src/de/grobox/liberario/NetworkProviderFactory.java
Expand Up @@ -83,7 +83,6 @@ public final class NetworkProviderFactory
private static Reference<DubProvider> dubProviderRef;
private static Reference<SeptaProvider> septaProviderRef;
private static Reference<SydneyProvider> sydneyProviderRef;
private static Reference<MetProvider> metProviderRef;
private static Reference<VgsProvider> vgsProviderRef;
private static Reference<WienProvider> wienProviderRef;
private static Reference<PacaProvider> pacaProviderRef;
Expand Down Expand Up @@ -826,19 +825,6 @@ else if (networkId.equals(NetworkId.SYDNEY))
sydneyProviderRef = new SoftReference<>(provider);
return provider;
}
else if (networkId.equals(NetworkId.MET))
{
if (metProviderRef != null)
{
final MetProvider provider = metProviderRef.get();
if (provider != null)
return provider;
}

final MetProvider provider = new MetProvider();
metProviderRef = new SoftReference<>(provider);
return provider;
}
else if (networkId.equals(NetworkId.VGS))
{
if (vgsProviderRef != null)
Expand Down
6 changes: 0 additions & 6 deletions src/de/grobox/liberario/TransportNetworks.java
Expand Up @@ -458,12 +458,6 @@ private List<TransportNetwork> populateNetworks() {
.setRegion(region)
);

list.add(new TransportNetwork(context, NetworkId.MET)
.setName(getString(R.string.np_name_met))
.setDescription(getString(R.string.np_desc_met))
.setRegion(region)
);

// France
region = region(R.string.np_region_france, "\uD83C\uDDEB\uD83C\uDDF7");

Expand Down

0 comments on commit bd650fb

Please sign in to comment.