aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java2
-rw-r--r--main/src/cgeo/geocaching/activity/Progress.java2
-rw-r--r--tests/src/cgeo/geocaching/GeocacheTest.java (renamed from tests/src/cgeo/geocaching/CacheTest.java)2
-rw-r--r--tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java8
4 files changed, 12 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 32aabd8..b4c7b33 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1873,8 +1873,10 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
@Override
public void onFinishEditNoteDialog(final String note) {
cache.setPersonalNote(note);
+ cache.parseWaypointsFromNote();
setPersonalNote();
cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));
+ CacheDetailActivity.this.notifyDataSetChanged();
}
};
final FragmentManager fm = getSupportFragmentManager();
diff --git a/main/src/cgeo/geocaching/activity/Progress.java b/main/src/cgeo/geocaching/activity/Progress.java
index 68ac272..34e7623 100644
--- a/main/src/cgeo/geocaching/activity/Progress.java
+++ b/main/src/cgeo/geocaching/activity/Progress.java
@@ -54,7 +54,7 @@ public class Progress {
dialog = new CustomProgressDialog(context);
}
else {
- dialog = new ProgressDialog(context, ActivityMixin.getDialogTheme());
+ dialog = new ProgressDialog(context);
}
dialog.setTitle(title);
dialog.setMessage(message);
diff --git a/tests/src/cgeo/geocaching/CacheTest.java b/tests/src/cgeo/geocaching/GeocacheTest.java
index 20c7d9e..f3c9a65 100644
--- a/tests/src/cgeo/geocaching/CacheTest.java
+++ b/tests/src/cgeo/geocaching/GeocacheTest.java
@@ -6,7 +6,7 @@ import android.test.AndroidTestCase;
import java.util.Date;
-public class CacheTest extends AndroidTestCase {
+public class GeocacheTest extends AndroidTestCase {
final static private class MockedEventCache extends Geocache {
public MockedEventCache(final Date date) {
diff --git a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
index 2e4660b..076f2c9 100644
--- a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java
@@ -1,5 +1,7 @@
package cgeo.geocaching.geopoint;
+import cgeo.geocaching.ui.Formatter;
+
import android.test.AndroidTestCase;
public class GeoPointParserTest extends AndroidTestCase {
@@ -49,6 +51,12 @@ public class GeoPointParserTest extends AndroidTestCase {
assertTrue(goal1.isEqualTo(goal2, 1e-6));
}
+ public static void testParseOurOwnSeparator() {
+ final Geopoint separator = GeopointParser.parse("N 49° 43' 57\"" + Formatter.SEPARATOR + "E 2 12' 35");
+ final Geopoint noSeparator = GeopointParser.parse("N 49 43.95 E2°12.5833333333");
+ assertTrue(separator.isEqualTo(noSeparator, 1e-6));
+ }
+
public static void testInSentence() {
final Geopoint p1 = GeopointParser.parse("Station3: N51 21.523 / E07 02.680");
final Geopoint p2 = GeopointParser.parse("N51 21.523", "E07 02.680");