diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2012-11-18 10:36:18 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2012-11-18 10:36:18 +0100 |
| commit | dc6807e55be0f0d8d84cea89a7563477c42ae222 (patch) | |
| tree | 292a2bc33d48b953f6cb942bb3a21398a89470b4 /main/src | |
| parent | 5f983eef81e31207857eb8142b7d41f8bc511b46 (diff) | |
| download | cgeo-dc6807e55be0f0d8d84cea89a7563477c42ae222.zip cgeo-dc6807e55be0f0d8d84cea89a7563477c42ae222.tar.gz cgeo-dc6807e55be0f0d8d84cea89a7563477c42ae222.tar.bz2 | |
fix: exception in syslog for missing map preview
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/StaticMapsProvider.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java index 371b432..8292cb4 100644 --- a/main/src/cgeo/geocaching/StaticMapsProvider.java +++ b/main/src/cgeo/geocaching/StaticMapsProvider.java @@ -271,14 +271,23 @@ public class StaticMapsProvider { } public static Bitmap getPreviewMap(final String geocode) { - return BitmapFactory.decodeFile(StaticMapsProvider.getMapFile(geocode, PREFIX_PREVIEW, false).getPath()); + return decodeFile(StaticMapsProvider.getMapFile(geocode, PREFIX_PREVIEW, false)); } public static Bitmap getWaypointMap(final String geocode, int waypoint_id, int level) { - return BitmapFactory.decodeFile(StaticMapsProvider.getMapFile(geocode, WAYPOINT_PREFIX + waypoint_id + "_" + level, false).getPath()); + return decodeFile(StaticMapsProvider.getMapFile(geocode, WAYPOINT_PREFIX + waypoint_id + "_" + level, false)); } public static Bitmap getCacheMap(final String geocode, int level) { - return BitmapFactory.decodeFile(StaticMapsProvider.getMapFile(geocode, String.valueOf(level), false).getPath()); + return decodeFile(StaticMapsProvider.getMapFile(geocode, String.valueOf(level), false)); } + + private static Bitmap decodeFile(final File mapFile) { + // avoid exception in system log, if we got nothing back from Google. + if (mapFile.exists()) { + return BitmapFactory.decodeFile(mapFile.getPath()); + } + return null; + } + } |
