fixes #2247 - parsing log type Retract Listing

2 files changed, 1 insertions, 129 deletions

diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index 9c1a6cc..a68e8af 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -38,6 +38,7 @@ public enum LogType {
     ANNOUNCEMENT(74, "74", "announcement", R.string.log_announcement),
     MOVE_COLLECTION(69, "69", "unused_collection", R.string.log_movecollection),
     MOVE_INVENTORY(70, "70", "unused_inventory", R.string.log_moveinventory),
+    RETRACT(25, "25", "rectract listing", R.string.log_retractlisting),
     UNKNOWN(0, "unknown", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet
 
     public final int id;
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java.orig b/main/src/cgeo/geocaching/enumerations/LogType.java.orig
deleted file mode 100644
index d2a3432..0000000
--- a/main/src/cgeo/geocaching/enumerations/LogType.java.orig
+++ /dev/null
@@ -1,129 +0,0 @@
-package cgeo.geocaching.enumerations;
-
-import cgeo.geocaching.R;
-import cgeo.geocaching.cgeoapplication;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-
-
-/**
- * Different log types
- */
-public enum LogType {
-
-<<<<<<< HEAD
-    FOUND_IT(2, "2", "found it", R.string.log_found, R.drawable.mark_green),
-    DIDNT_FIND_IT(3, "3", "didn't find it", R.string.log_dnf, R.drawable.mark_red),
-    NOTE(4, "4", "write note", 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),
-    TEMP_DISABLE_LISTING(22, "22", "temporarily disable listing", 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", R.string.log_attend),
-    ATTENDED(10, "10", "attended", R.string.log_attended, R.drawable.mark_green),
-    RETRIEVED_IT(13, "13", "retrieved it", R.string.log_retrieved, R.drawable.mark_green),
-    PLACED_IT(14, "14", "placed it", R.string.log_placed),
-    GRABBED_IT(19, "19", "grabbed it", R.string.log_grabbed, R.drawable.mark_green),
-    NEEDS_MAINTENANCE(45, "45", "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),
-    DISCOVERED_IT(48, "48", "discovered it", R.string.log_discovered, R.drawable.mark_green),
-    POST_REVIEWER_NOTE(18, "18", "post reviewer note", R.string.log_reviewer),
-    VISIT(1001, "1001", "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),
-    MOVE_COLLECTION(69, "69", "unused_collection", R.string.log_movecollection),
-    MOVE_INVENTORY(70, "70", "unused_inventory", R.string.log_moveinventory),
-    UNKNOWN(0, "unknown", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet
-=======
-    FOUND_IT(2, "2", "found it", R.string.log_found),
-    DIDNT_FIND_IT(3, "3", "didn't find it", R.string.log_dnf),
-    NOTE(4, "4", "write note", R.string.log_note),
-    PUBLISH_LISTING(1003, "24", "publish listing", R.string.log_published),
-    ENABLE_LISTING(23, "23", "enable listing", R.string.log_enabled),
-    ARCHIVE(5, "5", "archive", R.string.log_archived),
-    TEMP_DISABLE_LISTING(22, "22", "temporarily disable listing", R.string.log_disabled),
-    NEEDS_ARCHIVE(7, "7", "needs archived", R.string.log_needs_archived),
-    WILL_ATTEND(9, "9", "will attend", R.string.log_attend),
-    ATTENDED(10, "10", "attended", R.string.log_attended),
-    RETRIEVED_IT(13, "13", "retrieved it", R.string.log_retrieved),
-    PLACED_IT(14, "14", "placed it", R.string.log_placed),
-    GRABBED_IT(19, "19", "grabbed it", R.string.log_grabbed),
-    NEEDS_MAINTENANCE(45, "45", "needs maintenance", R.string.log_maintenance_needed),
-    OWNER_MAINTENANCE(46, "46", "owner maintenance", R.string.log_maintained),
-    UPDATE_COORDINATES(47, "47", "update coordinates", R.string.log_update),
-    DISCOVERED_IT(48, "48", "discovered it", R.string.log_discovered),
-    POST_REVIEWER_NOTE(18, "68", "post reviewer note", R.string.log_reviewer),
-    VISIT(1001, "1001", "visit", R.string.log_tb_visit),
-    WEBCAM_PHOTO_TAKEN(11, "11", "webcam photo taken", R.string.log_webcam),
-    ANNOUNCEMENT(74, "74", "announcement", R.string.log_announcement),
-    MOVE_COLLECTION(69, "69", "unused_collection", R.string.log_movecollection),
-    MOVE_INVENTORY(70, "70", "unused_inventory", R.string.log_moveinventory),
-    UNKNOWN(0, "unknown", "", R.string.err_unknown); // LogType not init. yet
->>>>>>> refs/remotes/upstream/release
-
-    public final int id;
-    public final String iconName;
-    public final String type;
-    private final int stringId;
-    public final int markerId;
-
-    private LogType(int id, String iconName, String type, int stringId, int markerId) {
-        this.id = id;
-        this.iconName = iconName;
-        this.type = type;
-        this.stringId = stringId;
-        this.markerId = markerId;
-    }
-
-    private LogType(int id, String iconName, String type, int stringId) {
-        this(id, iconName, type, stringId, R.drawable.mark_gray);
-    }
-
-    private final static Map<String, LogType> FIND_BY_ICONNAME;
-    private final static Map<String, LogType> FIND_BY_TYPE;
-    static {
-        final HashMap<String, LogType> mappingPattern = new HashMap<String, LogType>();
-        final HashMap<String, LogType> mappingType = new HashMap<String, LogType>();
-        for (LogType lt : values()) {
-            mappingPattern.put(lt.iconName, lt);
-            mappingType.put(lt.type, lt);
-        }
-        FIND_BY_ICONNAME = Collections.unmodifiableMap(mappingPattern);
-        FIND_BY_TYPE = Collections.unmodifiableMap(mappingType);
-    }
-
-    public static LogType getById(final int id) {
-        for (LogType logType : values()) {
-            if (logType.id == id) {
-                return logType;
-            }
-        }
-        return UNKNOWN;
-    }
-
-    public static LogType getByIconName(final String imageType) {
-        final LogType result = imageType != null ? LogType.FIND_BY_ICONNAME.get(imageType.toLowerCase(Locale.US).trim()) : null;
-        if (result == null) {
-            return UNKNOWN;
-        }
-        return result;
-    }
-
-    public static LogType getByType(final String type) {
-        final LogType result = type != null ? LogType.FIND_BY_TYPE.get(type.toLowerCase(Locale.US).trim()) : null;
-        if (result == null) {
-            return UNKNOWN;
-        }
-        return result;
-    }
-
-    public final String getL10n() {
-        return cgeoapplication.getInstance().getBaseContext().getResources().getString(stringId);
-    }
-}