Small changes.

This commit is contained in:
Brian Pellin
2009-12-19 00:05:49 -06:00
parent aa9f20ec4f
commit 69536f5ea8
3 changed files with 11 additions and 1 deletions

View File

@@ -203,7 +203,7 @@ public class EntryActivity extends LockCloseActivity {
if ( PwEntry.IsNever(mEntry.tExpire.getJDate()) ) {
populateText(R.id.entry_expires, R.string.never);
} else {
populateText(R.id.entry_expires, df.format(mEntry.tExpire));
populateText(R.id.entry_expires, df.format(mEntry.tExpire.getJDate()));
}
populateText(R.id.entry_comment, mEntry.additional);
}

View File

@@ -55,6 +55,7 @@ public class App extends Application {
}
public static Calendar getCalendar() {
if ( calendar == null ) {
calendar = Calendar.getInstance();
}

View File

@@ -30,6 +30,8 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Random;
import android.util.Log;
import com.keepassdroid.Database;
import com.keepassdroid.keepasslib.PwDate;
@@ -79,6 +81,13 @@ public class PwEntry {
cal.setTime(date);
cal.set(Calendar.MILLISECOND, 0);
Log.d("never", "L="+ never.get(Calendar.YEAR) + " R=" + cal.get(Calendar.YEAR));
Log.d("never", "L="+ never.get(Calendar.MONTH) + " R=" + cal.get(Calendar.MONTH));
Log.d("never", "L="+ never.get(Calendar.DAY_OF_MONTH) + " R=" + cal.get(Calendar.DAY_OF_MONTH));
Log.d("never", "L="+ never.get(Calendar.HOUR) + " R=" + cal.get(Calendar.HOUR));
Log.d("never", "L="+ never.get(Calendar.MINUTE) + " R=" + cal.get(Calendar.MINUTE));
Log.d("never", "L="+ never.get(Calendar.SECOND) + " R=" + cal.get(Calendar.SECOND));
return (never.get(Calendar.YEAR) == cal.get(Calendar.YEAR)) &&
(never.get(Calendar.MONTH) == cal.get(Calendar.MONTH)) &&
(never.get(Calendar.DAY_OF_MONTH) == cal.get(Calendar.DAY_OF_MONTH)) &&