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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 166b291c6cf611dbb5d1abeff8b075b91b174004..ac188d5be8727161de1dcc3d2af7cb11bf62a4b8 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -150,4 +150,5 @@
        <string name="discard_changes">Discard changes</string>\r
        <string name="entry_saved">Entry saved</string>\r
        <string name="last_edited">Last edited</string>\r
+       <string name="last_edited_unknown">unknown</string>\r
 </resources>

diff --git a/src/org/openintents/safe/DBHelper.java b/src/org/openintents/safe/DBHelper.java
index 60c165bdba5f7d49b7747150444ab55ef72092e5..181531000290324b507c498637a951513eedb4ff 100644 (file)
--- 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 8fe75370a93c4441c99c1058efd700578871aa31..456257f9a58f1fe20b84c9971640a43793c68f81 100644 (file)
--- 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 8103e43cd376040d14ccf5f5050a4d975a9e8340..1e284f8d36376650ae89b2f718ca1b7d56b9f829 100644 (file)
--- 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 e9d58f1a13fd541096ab784150845d0564b7836d..a45c6660d94f1a6da6eab317a820bda4f6196d2f 100644 (file)
--- 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());
                                }