diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-10-24 18:13:11 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-10-24 18:13:11 +0200 |
| commit | 115ae0124bd995aefcd1286cd3bdbd64afd88412 (patch) | |
| tree | b33e9be706fd0b52d6df59a3cb8fe539a7ac25d2 | |
| parent | 03c915c0b432f39cfacb3915bb077b40202ee0ab (diff) | |
| parent | 6803fe2959d8e2bb13a2bfbe591c6be637fda2e7 (diff) | |
| download | cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.zip cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.tar.gz cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.tar.bz2 | |
Merge remote-tracking branch 'origin/release'
Conflicts:
tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
| -rw-r--r-- | main/res/values/changelog_release.xml | 5 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/SettingsActivity.java | 6 | ||||
| -rw-r--r--[l---------] | send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js | 0 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index fcb417b..9776247 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,6 +2,11 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n + <b>2013.10.23</b>\n + · Adapted to changes on gc.com (spoiler images)\n + · Possibility to manually select file path for maps\n + \n + \n <b>2013.09.19</b>\n · Unscaled log picture now uploaded correctly\n · GPS exhibit not recognized as event cache\n diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java index d798a82..7b3f7fa 100644 --- a/main/src/cgeo/geocaching/settings/SettingsActivity.java +++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java @@ -93,8 +93,10 @@ public class SettingsActivity extends PreferenceActivity { if (gotoPage == INTENT_GOTO_SERVICES) { // start with services screen PreferenceScreen main = (PreferenceScreen) getPreference(R.string.pref_fakekey_main_screen); - int index = getPreference(R.string.pref_fakekey_services_screen).getOrder(); - main.onItemClick(null, null, index, 0); + if (main != null) { + int index = getPreference(R.string.pref_fakekey_services_screen).getOrder(); + main.onItemClick(null, null, index, 0); + } } } diff --git a/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js b/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js index 1e1f91e..1e1f91e 120000..100644 --- a/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js +++ b/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java index 52d26ee..d3e7a27 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java @@ -30,7 +30,6 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase { assertNotNull(searchResult); assertFalse(searchResult.isEmpty()); assertTrue(searchResult.getGeocodes().contains("GC4ER5H")); - // Edelstein N 52° 25.363 E 009° 36.236 // 22.10.13: Changed from GC211WG (archived) to GC4ER5H in same area } |