Fixes #3617, Archived message is shown as note

- added this, and some other missing log types, to OkapiClient

3 files changed, 31 insertions, 5 deletions

diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 017a538..666627c 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -131,6 +131,7 @@
     <string name="log_image_scale">Scaling</string>
     <string name="log_password_title">Log Password:</string>
     <string name="log_hint_log_password">Enter your log password</string>
+    <string name="log_oc_team_comment">OC Team comment</string>
 
     <string-array name="log_image_scales">
         <item>No scaling</item>
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 3d05223..f4bac08 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -485,6 +485,30 @@ final class OkapiClient {
         if ("Didn't find it".equalsIgnoreCase(logType)) {
             return LogType.DIDNT_FIND_IT;
         }
+        if ("Will attend".equalsIgnoreCase(logType)) {
+            return LogType.WILL_ATTEND;
+        }
+        if ("Attended".equalsIgnoreCase(logType)) {
+            return LogType.ATTENDED;
+        }
+        if ("Temporarily unavailable".equalsIgnoreCase(logType)) {
+            return LogType.TEMP_DISABLE_LISTING;
+        }
+        if ("Ready to search".equalsIgnoreCase(logType)) {
+            return LogType.ENABLE_LISTING;
+        }
+        if ("Archived".equalsIgnoreCase(logType)) {
+            return LogType.ARCHIVE;
+        }
+        if ("Needs maintenance".equalsIgnoreCase(logType)) {
+            return LogType.NEEDS_MAINTENANCE;
+        }
+        if ("Moved".equalsIgnoreCase(logType)) {
+            return LogType.UPDATE_COORDINATES;
+        }
+        if ("OC Team comment".equalsIgnoreCase(logType)) {
+            return LogType.POST_REVIEWER_NOTE;
+        }
         return LogType.NOTE;
     }
 
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index 543f83d..64711bb 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -19,19 +19,19 @@ public enum LogType {
     DIDNT_FIND_IT(3, "3", "didn't find it", "Didn't find it", R.string.log_dnf, R.drawable.mark_red),
     NOTE(4, "4", "write note", "Comment", R.string.log_note),
     PUBLISH_LISTING(1003, "24", "publish listing", "", R.string.log_published, R.drawable.mark_green_more),
-    ENABLE_LISTING(23, "23", "enable listing", "", R.string.log_enabled, R.drawable.mark_green_more),
-    ARCHIVE(5, "5", "archive", "", R.string.log_archived, R.drawable.mark_red_more),
+    ENABLE_LISTING(23, "23", "enable listing", "Ready to search", R.string.log_enabled, R.drawable.mark_green_more),
+    ARCHIVE(5, "5", "archive", "Archived", R.string.log_archived, R.drawable.mark_red_more),
     UNARCHIVE(12, "12", "unarchive", "", R.string.log_unarchived, R.drawable.mark_green_more),
-    TEMP_DISABLE_LISTING(22, "22", "temporarily disable listing", "", R.string.log_disabled, R.drawable.mark_red_more),
+    TEMP_DISABLE_LISTING(22, "22", "temporarily disable listing", "Temporarily unavailable", R.string.log_disabled, R.drawable.mark_red_more),
     NEEDS_ARCHIVE(7, "7", "needs archived", "", R.string.log_needs_archived, R.drawable.mark_red),
     WILL_ATTEND(9, "9", "will attend", "Will attend", R.string.log_attend),
     ATTENDED(10, "10", "attended", "Attended", R.string.log_attended, R.drawable.mark_green),
     RETRIEVED_IT(13, "13", "retrieved it", "", R.string.log_retrieved, R.drawable.mark_green_more),
     PLACED_IT(14, "14", "placed it", "", R.string.log_placed, R.drawable.mark_green_more),
     GRABBED_IT(19, "19", "grabbed it", "", R.string.log_grabbed, R.drawable.mark_green_more),
-    NEEDS_MAINTENANCE(45, "45", "needs maintenance", "Comment", R.string.log_maintenance_needed, R.drawable.mark_red),
+    NEEDS_MAINTENANCE(45, "45", "needs maintenance", "Needs maintenance", R.string.log_maintenance_needed, R.drawable.mark_red),
     OWNER_MAINTENANCE(46, "46", "owner maintenance", "", R.string.log_maintained, R.drawable.mark_green_more),
-    UPDATE_COORDINATES(47, "47", "update coordinates", "", R.string.log_update),
+    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),
     VISIT(1001, "75", "visit", "", R.string.log_tb_visit, R.drawable.mark_green),
@@ -41,6 +41,7 @@ public enum LogType {
     MOVE_INVENTORY(70, "70", "unused_inventory", "", R.string.log_moveinventory),
     RETRACT(25, "25", "retract listing", "", R.string.log_retractlisting),
     MARKED_MISSING(16, "16", "marked missing", "", R.string.log_marked_missing, R.drawable.mark_red),
+    OC_TEAM_COMMENT(83, "68", "", "OC Team comment", R.string.log_oc_team_comment),
     UNKNOWN(0, "unknown", "", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet
 
     public final int id;