diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-03-31 10:04:05 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-03-31 10:04:05 +0200 |
| commit | 8984233104dac602838e5663bafdc41568bc57ed (patch) | |
| tree | 3b2b071b11811b440520a6a21496e0f640519fe7 | |
| parent | b8bb4f70b3f476a227acadc103caa48cd109495c (diff) | |
| parent | 4f8a1c6aeef324547ddd9e48ed726b57bfe8cf51 (diff) | |
| download | cgeo-8984233104dac602838e5663bafdc41568bc57ed.zip cgeo-8984233104dac602838e5663bafdc41568bc57ed.tar.gz cgeo-8984233104dac602838e5663bafdc41568bc57ed.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | main/libs/rxjava-android-0.17.1-cgeo-1.jar (renamed from main/libs/rxjava-android-0.17.1-cgeo.jar) | bin | 36414 -> 36410 bytes | |||
| -rw-r--r-- | main/libs/rxjava-async-util-0.17.1-cgeo-1.jar (renamed from main/libs/rxjava-async-util-0.17.1-cgeo.jar) | bin | 48346 -> 48347 bytes | |||
| -rw-r--r-- | main/libs/rxjava-core-0.17.1-cgeo-1.jar (renamed from main/libs/rxjava-core-0.17.1-cgeo.jar) | bin | 716623 -> 716976 bytes | |||
| -rw-r--r-- | main/res/values/changelog_release.xml | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/main/libs/rxjava-android-0.17.1-cgeo.jar b/main/libs/rxjava-android-0.17.1-cgeo-1.jar Binary files differindex 6fe7eb7..c118c9d 100644 --- a/main/libs/rxjava-android-0.17.1-cgeo.jar +++ b/main/libs/rxjava-android-0.17.1-cgeo-1.jar diff --git a/main/libs/rxjava-async-util-0.17.1-cgeo.jar b/main/libs/rxjava-async-util-0.17.1-cgeo-1.jar Binary files differindex 17217d8..01098e6 100644 --- a/main/libs/rxjava-async-util-0.17.1-cgeo.jar +++ b/main/libs/rxjava-async-util-0.17.1-cgeo-1.jar diff --git a/main/libs/rxjava-core-0.17.1-cgeo.jar b/main/libs/rxjava-core-0.17.1-cgeo-1.jar Binary files differindex b5e06d9..6e99119 100644 --- a/main/libs/rxjava-core-0.17.1-cgeo.jar +++ b/main/libs/rxjava-core-0.17.1-cgeo-1.jar diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index d5317e2..a8edc4d 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,6 +2,12 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n + <b>2014.03.31:</b>\n + <b>Bugfixing:</b>\n + · Make it again compatible with Android before 2.3.\n + · Fix a bug with downloading of preview maps.\n + \n + \n <b>2014.03.30:</b>\n <b>New features:</b>\n · New languages: Catalan, Lithuanian, Romanian\n diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index ce296e4..f525955 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1352,7 +1352,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc Bitmap image = StaticMapsProvider.getPreviewMap(cache); if (image == null) { - if (Settings.isStoreOfflineMaps()) { + if (Settings.isStoreOfflineMaps() && cache.getCoords() != null) { StaticMapsProvider.storeCachePreviewMap(cache); image = StaticMapsProvider.getPreviewMap(cache); } |