From acc402b3876d7022d19ff409caaa545ddb6e0f32 Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Tue, 4 Jun 2013 18:17:18 +0200 Subject: #2833: fix log date format --- main/src/cgeo/geocaching/connector/gc/GCParser.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index b2705b2..1c8e288 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -967,12 +967,13 @@ public abstract class GCParser { + "; date: " + year + "." + month + "." + day + ", log: " + logInfo + "; trackables: " + (trackables != null ? trackables.size() : "0")); + final String dateString = String.format("%04d", year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day); final Parameters params = new Parameters( "__EVENTTARGET", "", "__EVENTARGUMENT", "", "__LASTFOCUS", "", "ctl00$ContentBody$LogBookPanel1$ddLogType", Integer.toString(logType.id), - "ctl00$ContentBody$LogBookPanel1$uxDateVisited", String.format("%02d", month) + "/" + String.format("%02d", day) + "/" + String.format("%04d", year), + "ctl00$ContentBody$LogBookPanel1$uxDateVisited", dateString, "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Month", Integer.toString(month), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Day", Integer.toString(day), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Year", Integer.toString(year), @@ -1168,7 +1169,8 @@ public abstract class GCParser { params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", ""); } else { params.put("ctl00$ContentBody$LogBookPanel1$DateTimeLogged", Integer.toString(month) + "/" + Integer.toString(day) + "/" + Integer.toString(year)); - params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", Integer.toString(month) + "/" + Integer.toString(day) + "/" + Integer.toString(year)); + final String dateString = String.format("%04d", year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day); + params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", dateString); } params.put( "ctl00$ContentBody$LogBookPanel1$DateTimeLogged$Day", Integer.toString(day), -- cgit v1.1 From 794272e348b2736b4c5e6f460130de7827097347 Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Tue, 4 Jun 2013 18:25:08 +0200 Subject: Revert "#2833: fix log date format" This reverts commit acc402b3876d7022d19ff409caaa545ddb6e0f32. --- main/src/cgeo/geocaching/connector/gc/GCParser.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 1c8e288..b2705b2 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -967,13 +967,12 @@ public abstract class GCParser { + "; date: " + year + "." + month + "." + day + ", log: " + logInfo + "; trackables: " + (trackables != null ? trackables.size() : "0")); - final String dateString = String.format("%04d", year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day); final Parameters params = new Parameters( "__EVENTTARGET", "", "__EVENTARGUMENT", "", "__LASTFOCUS", "", "ctl00$ContentBody$LogBookPanel1$ddLogType", Integer.toString(logType.id), - "ctl00$ContentBody$LogBookPanel1$uxDateVisited", dateString, + "ctl00$ContentBody$LogBookPanel1$uxDateVisited", String.format("%02d", month) + "/" + String.format("%02d", day) + "/" + String.format("%04d", year), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Month", Integer.toString(month), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Day", Integer.toString(day), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Year", Integer.toString(year), @@ -1169,8 +1168,7 @@ public abstract class GCParser { params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", ""); } else { params.put("ctl00$ContentBody$LogBookPanel1$DateTimeLogged", Integer.toString(month) + "/" + Integer.toString(day) + "/" + Integer.toString(year)); - final String dateString = String.format("%04d", year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day); - params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", dateString); + params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", Integer.toString(month) + "/" + Integer.toString(day) + "/" + Integer.toString(year)); } params.put( "ctl00$ContentBody$LogBookPanel1$DateTimeLogged$Day", Integer.toString(day), -- cgit v1.1 From 8beee2eb36fa8507722417cfb989c106fe16bf61 Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Tue, 4 Jun 2013 06:29:11 +0200 Subject: adapt test case to website changes --- tests/src/cgeo/geocaching/cgeoApplicationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java index a877660..82e31f7 100644 --- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java @@ -121,7 +121,7 @@ public class cgeoApplicationTest extends CGeoTestCase { public static void testSearchByGeocodeNotExisting() { final SearchResult search = Geocache.searchByGeocode("GC123456", null, 0, true, null); assertNotNull(search); - assertEquals(StatusCode.UNPUBLISHED_CACHE, search.getError()); + assertEquals(StatusCode.COMMUNICATION_ERROR, search.getError()); } /** -- cgit v1.1 From d631f9bfa18e4768e563206b460ed587e639ba36 Mon Sep 17 00:00:00 2001 From: rsudev Date: Tue, 4 Jun 2013 22:35:57 +0200 Subject: Adapt test project to ADT changes --- tests/.classpath | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/.classpath b/tests/.classpath index 9bd2efb..67539bd 100644 --- a/tests/.classpath +++ b/tests/.classpath @@ -9,5 +9,6 @@ + -- cgit v1.1 From d6db97c0057f15474e16a1ee78f85ef20d8c527a Mon Sep 17 00:00:00 2001 From: rsudev Date: Tue, 4 Jun 2013 22:36:35 +0200 Subject: Fixes #2833, website changes 2013-06-02 Get custom dateformat from login Use it for posting logs --- main/src/cgeo/geocaching/connector/gc/GCParser.java | 5 +++-- main/src/cgeo/geocaching/connector/gc/Login.java | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index b2705b2..6b456fd 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -54,6 +54,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.EnumSet; +import java.util.GregorianCalendar; import java.util.List; import java.util.Locale; import java.util.Set; @@ -972,7 +973,7 @@ public abstract class GCParser { "__EVENTARGUMENT", "", "__LASTFOCUS", "", "ctl00$ContentBody$LogBookPanel1$ddLogType", Integer.toString(logType.id), - "ctl00$ContentBody$LogBookPanel1$uxDateVisited", String.format("%02d", month) + "/" + String.format("%02d", day) + "/" + String.format("%04d", year), + "ctl00$ContentBody$LogBookPanel1$uxDateVisited", Login.getCustomGcDateFormat().format(new GregorianCalendar(year, month - 1, day).getTime()), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Month", Integer.toString(month), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Day", Integer.toString(day), "ctl00$ContentBody$LogBookPanel1$uxDateVisited$Year", Integer.toString(year), @@ -1168,7 +1169,7 @@ public abstract class GCParser { params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", ""); } else { params.put("ctl00$ContentBody$LogBookPanel1$DateTimeLogged", Integer.toString(month) + "/" + Integer.toString(day) + "/" + Integer.toString(year)); - params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", Integer.toString(month) + "/" + Integer.toString(day) + "/" + Integer.toString(year)); + params.put("ctl00$ContentBody$LogBookPanel1$uxDateVisited", Login.getCustomGcDateFormat().format(new GregorianCalendar(year, month - 1, day).getTime())); } params.put( "ctl00$ContentBody$LogBookPanel1$DateTimeLogged$Day", Integer.toString(day), diff --git a/main/src/cgeo/geocaching/connector/gc/Login.java b/main/src/cgeo/geocaching/connector/gc/Login.java index f3ef290..7351311 100644 --- a/main/src/cgeo/geocaching/connector/gc/Login.java +++ b/main/src/cgeo/geocaching/connector/gc/Login.java @@ -328,6 +328,15 @@ public abstract class Login { return parseGcCustomDate(input, Settings.getGcCustomDate()); } + public static SimpleDateFormat getCustomGcDateFormat() { + final String format = Settings.getGcCustomDate(); + if (gcCustomDateFormats.containsKey(format)) { + return gcCustomDateFormats.get(format); + } + + return gcCustomDateFormats.get("MM/dd/yyyy"); + } + /** * checks if an Array of Strings is empty or not. Empty means: * - Array is null -- cgit v1.1