diff options
| author | rsudev <rasch@munin-soft.de> | 2013-09-12 22:14:01 -0700 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2013-09-12 22:14:01 -0700 |
| commit | d9adbcd708b91dfae9af0691620ff285df2379b4 (patch) | |
| tree | b26cb8e216cccdb9783f6c8627755211cdf8c6d7 /main/src | |
| parent | 61c6a6335c42b5b070c2435e3b1d40426b3ad193 (diff) | |
| parent | 0e1bfd97dea5634cb4100ee96f9244bf2e57c4ac (diff) | |
| download | cgeo-d9adbcd708b91dfae9af0691620ff285df2379b4.zip cgeo-d9adbcd708b91dfae9af0691620ff285df2379b4.tar.gz cgeo-d9adbcd708b91dfae9af0691620ff285df2379b4.tar.bz2 | |
Merge pull request #3268 from marco-dev/fixOfflineMapsSettings
fixes #3248 - select map file first to get offline map choice
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java index 7c6865d..d099b79 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java @@ -1,7 +1,6 @@ package cgeo.geocaching.maps.mapsforge; import cgeo.geocaching.R; -import cgeo.geocaching.settings.Settings; import cgeo.geocaching.cgeoapplication; import cgeo.geocaching.maps.AbstractMapProvider; import cgeo.geocaching.maps.MapProviderFactory; @@ -10,6 +9,7 @@ import cgeo.geocaching.maps.interfaces.MapProvider; import cgeo.geocaching.maps.interfaces.MapSource; import cgeo.geocaching.maps.mapsforge.v024.MapsforgeMapActivity024; import cgeo.geocaching.maps.mapsforge.v024.MapsforgeMapItemFactory024; +import cgeo.geocaching.settings.Settings; import cgeo.geocaching.utils.Log; import org.apache.commons.lang3.StringUtils; @@ -169,9 +169,5 @@ public final class MapsforgeMapProvider extends AbstractMapProvider { final String mapName = StringUtils.capitalize(StringUtils.substringBeforeLast(new File(mapFile).getName(), ".")); registerMapSource(new OfflineMapSource(mapFile, this, mapName + " (" + resources.getString(R.string.map_source_osm_offline) + ")", MapGeneratorInternal.DATABASE_RENDERER)); } - // have a default entry, if no map files are available. otherwise we cannot select "offline" in the settings - if (offlineMaps.isEmpty()) { - registerMapSource(new OfflineMapSource("", this, resources.getString(R.string.map_source_osm_offline), MapGeneratorInternal.DATABASE_RENDERER)); - } } } |
