Merge branch 'master' of github.com:poundifdef/VirginMobileMinutesChe…

…cker
poundifdef · Jul 31, 2011 · 550607c · 550607c
2 parents b8c98d1 + 8786ca3
commit 550607c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/VirginMobileMinutesChecker/src/com/baker/vm/VMAccount.java b/VirginMobileMinutesChecker/src/com/baker/vm/VMAccount.java
@@ -170,7 +170,9 @@ public Calendar getChargedOnCal()
     		// This won't throw NumberFormatExceptions because the matches must be digits
     		cal = new GregorianCalendar(Integer.parseInt("20" + m.group(3)),
     									Integer.parseInt(m.group(1)) - 1,
-    									Integer.parseInt(m.group(2)));
+    									Integer.parseInt(m.group(2)),
+    									23,
+    									59);
     	}
 
     	return cal;

diff --git a/VirginMobileMinutesChecker/src/com/baker/vm/ui/MinutesGraphDrawable.java b/VirginMobileMinutesChecker/src/com/baker/vm/ui/MinutesGraphDrawable.java
@@ -55,9 +55,11 @@ protected void updateModel(final VMAccount iAccount)
 		{
 			final Calendar end = account.getChargedOnCal();
 			final Calendar start = (Calendar) end.clone();
-			start.set(Calendar.MONTH, end.get(Calendar.MONTH) - 1);
+			start.add(Calendar.MONTH, -1);
+            start.set(Calendar.HOUR_OF_DAY, 0);
+            start.set(Calendar.MINUTE, 0);
 			final Calendar now = new GregorianCalendar();
-
+			
 			final long total = end.getTimeInMillis() - start.getTimeInMillis();
 			final long millis = now.getTimeInMillis() - start.getTimeInMillis();
 
@@ -74,7 +76,7 @@ protected void updateModel(final VMAccount iAccount)
 
 	private String toString(final Calendar end)
 	{
-		return end.get(Calendar.MONTH) + "/" + end.get(Calendar.DAY_OF_MONTH) + "/" + end.get(Calendar.YEAR);
+		return end.get(Calendar.MONTH) + "/" + end.get(Calendar.DAY_OF_MONTH) + "/" + end.get(Calendar.YEAR) + " " + end.get(Calendar.HOUR_OF_DAY) + ":" + end.get(Calendar.MINUTE);
 	}
 
 	/**