diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-11-23 14:37:19 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-11-23 14:38:08 +0100 |
| commit | f59e23c38c1b6a39fcc55d2d96727372553bdca3 (patch) | |
| tree | dc26dab08d24fe91fc7b4d9beb3467c0d8b23d9f /main/src | |
| parent | 2ca892ad2e9bd208162fdab5e158d35e661c9e93 (diff) | |
| download | cgeo-f59e23c38c1b6a39fcc55d2d96727372553bdca3.zip cgeo-f59e23c38c1b6a39fcc55d2d96727372553bdca3.tar.gz cgeo-f59e23c38c1b6a39fcc55d2d96727372553bdca3.tar.bz2 | |
Inline once-used private method GeoData.getLocationProvider
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/sensors/GeoData.java | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/main/src/cgeo/geocaching/sensors/GeoData.java b/main/src/cgeo/geocaching/sensors/GeoData.java index a52eb55..99ba169 100644 --- a/main/src/cgeo/geocaching/sensors/GeoData.java +++ b/main/src/cgeo/geocaching/sensors/GeoData.java @@ -41,25 +41,20 @@ public class GeoData extends Location { return gpsLocation.getTime() >= netLocation.getTime() ? gpsLocation : netLocation; } - private static LocationProviderType getLocationProviderType(final String provider) { - if (provider.equals(LocationManager.GPS_PROVIDER)) { - return LocationProviderType.GPS; - } - if (provider.equals(LocationManager.NETWORK_PROVIDER)) { - return LocationProviderType.NETWORK; - } - // LocationManager.FUSED_PROVIDER constant is not available at API level 9 - if (provider.equals(FUSED_PROVIDER)) { - return LocationProviderType.FUSED; - } - if (provider.equals(LOW_POWER_PROVIDER)) { - return LocationProviderType.LOW_POWER; - } - return LocationProviderType.LAST; - } - public LocationProviderType getLocationProvider() { - return getLocationProviderType(getProvider()); + switch (getProvider()) { + case LocationManager.GPS_PROVIDER: + return LocationProviderType.GPS; + case LocationManager.NETWORK_PROVIDER: + return LocationProviderType.NETWORK; + case FUSED_PROVIDER: + // LocationManager.FUSED_PROVIDER constant is not available at API level 9 + return LocationProviderType.FUSED; + case LOW_POWER_PROVIDER: + return LocationProviderType.LOW_POWER; + default: + return LocationProviderType.LAST; + } } @NonNull |
