From d48b76a215e421c992c42ca591f737a2d9d785b1 Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Tue, 20 Jan 2009 00:26:32 +0000
Subject: [PATCH] Handle null with lastedit, also populate db lastdatetimeedit
 upon addition.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1798 72b678ce-9140-0410-bee8-679b907dd61a
---
 res/values/strings.xml                 | 1 +
 src/org/openintents/safe/DBHelper.java | 6 ++++++
 src/org/openintents/safe/PassEdit.java | 2 +-
 src/org/openintents/safe/PassList.java | 2 +-
 src/org/openintents/safe/PassView.java | 8 +++++++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 166b291..ac188d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -150,4 +150,5 @@
 	<string name="discard_changes">Discard changes</string>
 	<string name="entry_saved">Entry saved</string>
 	<string name="last_edited">Last edited</string>
+	<string name="last_edited_unknown">unknown</string>
 </resources>
diff --git a/src/org/openintents/safe/DBHelper.java b/src/org/openintents/safe/DBHelper.java
index 60c165b..1815310 100644
--- a/src/org/openintents/safe/DBHelper.java
+++ b/src/org/openintents/safe/DBHelper.java
@@ -622,6 +622,7 @@ public class DBHelper {
 			return;
 		}
 	    ContentValues args = new ContentValues();
+	    
 	    args.put("category", newCategoryId);
 	    
 	    try {
@@ -646,6 +647,11 @@ public class DBHelper {
 	    initialValues.put("website", entry.website);
 	    initialValues.put("note", entry.note);
 	    initialValues.put("unique_name", entry.uniqueName);
+		DateFormat dateFormatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT,
+			DateFormat.FULL);
+		Date today = new Date();
+		String dateOut = dateFormatter.format(today);
+	    initialValues.put("lastdatetimeedit", dateOut);
 
 	    try {
 	        id = db.insert(TABLE_PASSWORDS, null, initialValues);
diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java
index 8fe7537..456257f 100644
--- a/src/org/openintents/safe/PassEdit.java
+++ b/src/org/openintents/safe/PassEdit.java
@@ -42,7 +42,7 @@ import android.widget.Toast;
  */
 public class PassEdit extends Activity {
 
-	private static boolean debug = true;
+	private static boolean debug = false;
 	private static String TAG = "PassEdit";
 
 	public static final int REQUEST_GEN_PASS = 10;
diff --git a/src/org/openintents/safe/PassList.java b/src/org/openintents/safe/PassList.java
index 8103e43..1e284f8 100644
--- a/src/org/openintents/safe/PassList.java
+++ b/src/org/openintents/safe/PassList.java
@@ -55,7 +55,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
  */
 public class PassList extends ListActivity {
 
-	private static final boolean debug= true;
+	private static final boolean debug= false;
     private static final String TAG = "PassList";
 
     // Menu Item order
diff --git a/src/org/openintents/safe/PassView.java b/src/org/openintents/safe/PassView.java
index e9d58f1..a45c666 100644
--- a/src/org/openintents/safe/PassView.java
+++ b/src/org/openintents/safe/PassView.java
@@ -274,7 +274,13 @@ public class PassView extends Activity {
 					usernameText.setText(ch.decrypt(cryptUsername));
 					passwordText.setText(ch.decrypt(cryptPass));
 					noteText.setText(ch.decrypt(cryptNote));
-					lastEditedText.setText(getString(R.string.last_edited)+" "+row.lastEdited);
+					String lastEdited;
+					if (row.lastEdited!=null) {
+						lastEdited=row.lastEdited;
+					} else {
+						lastEdited=getString(R.string.last_edited_unknown);
+					}
+					lastEditedText.setText(getString(R.string.last_edited)+" "+lastEdited);
 				} catch (CryptoHelperException e) {
 					Log.e(TAG, e.toString());
 				}
-- 
2.50.1