aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/res/values/changelog_release.xml5
-rw-r--r--main/res/values/strings.xml1
-rw-r--r--main/src/cgeo/geocaching/enumerations/LogType.java8
3 files changed, 13 insertions, 1 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 2644c5c..671814d 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -4,7 +4,12 @@
<string name="changelog_release" translatable="false">\n
<b>Next bugfix release:</b>\n
<b>Bugfixes:</b>\n
+ · OC-login was not possible if no GC-login stored\n
· Geocodes are always case insensitive\n
+ · Fixed crashes in dir chooser\n
+ · Log password field missing for OC if changing log type\n
+ · Send2cgeo import screen not shown on second import start\n
+ · Fixed parsing of waypoints from personal note if no valid coords stored\n
\n
<b>2014.02.04:</b>\n
· Reinstate parsing of trackable name and owner after gc.com change\n
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index c4e3fae..e4b3947 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -79,6 +79,7 @@
<string name="log_needs_archived">Needs Archived</string>
<string name="log_discovered">Discovered</string>
<string name="log_reviewer">Reviewer Note</string>
+ <string name="log_submit_for_review">Submit for Review</string>
<string name="log_retractlisting">Retract Listing</string>
<string name="log_marked_missing">Marked Missing</string>
<string name="log_tb_nothing">Do Nothing</string>
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index a63ef4e..fa65b71 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -33,7 +33,8 @@ public enum LogType {
OWNER_MAINTENANCE(46, "46", "owner maintenance", "", R.string.log_maintained, R.drawable.mark_green_more),
UPDATE_COORDINATES(47, "47", "update coordinates", "Moved", R.string.log_update),
DISCOVERED_IT(48, "48", "discovered it", "", R.string.log_discovered, R.drawable.mark_green),
- POST_REVIEWER_NOTE(18, "68", "post reviewer note", "", R.string.log_reviewer),
+ POST_REVIEWER_NOTE(18, "18", "post reviewer note", "", R.string.log_reviewer),
+ SUBMIT_FOR_REVIEW(76, "76", "submit for review", "", R.string.log_submit_for_review),
VISIT(1001, "75", "visit", "", R.string.log_tb_visit, R.drawable.mark_green),
WEBCAM_PHOTO_TAKEN(11, "11", "webcam photo taken", "", R.string.log_webcam, R.drawable.mark_green),
ANNOUNCEMENT(74, "74", "announcement", "", R.string.log_announcement),
@@ -89,6 +90,11 @@ public enum LogType {
}
public static LogType getByIconName(final String imageType) {
+ // Special case for post reviewer note, which appears sometimes as 18.png (in individual entries) or as 68.png
+ // (in logs counts).
+ if ("68".equals(imageType)) {
+ return POST_REVIEWER_NOTE;
+ }
final LogType result = imageType != null ? LogType.FIND_BY_ICONNAME.get(imageType.toLowerCase(Locale.US).trim()) : null;
if (result == null) {
return UNKNOWN;