Added "Discard changes" to PassEdit.

Added Id to propset for all java and xml.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1763 72b678ce-9140-0410-bee8-679b907dd61a

diff --git a/res/layout-land/front_door.xml b/res/layout-land/front_door.xml
index d141870805fabf995e08b434f224676c46e299f4..173f0493eb9f126f1678bb3598b0d680598b21bc 100644 (file)
--- a/res/layout-land/front_door.xml
+++ b/res/layout-land/front_door.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- \r
-* $Id: front_door.xml 97 2009-01-13 02:34:09Z rmceoin $\r
+* $Id$\r
 * \r
 * Copyright 2008 Steven Osborn & Randy McEoin\r
 *\r

diff --git a/res/layout/chg_pass.xml b/res/layout/chg_pass.xml
index ab0fa2c6db1421a573001c1fce58fbec140ed169..b0b2828ddafcac94720febd426087b367565722e 100644 (file)
--- a/res/layout/chg_pass.xml
+++ b/res/layout/chg_pass.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: chg_pass.xml 71 2008-12-28 19:42:48Z peli0101 $
+* $Id$
 * 
 * Copyright 2008 Randy McEoin
 *

diff --git a/res/layout/front_door.xml b/res/layout/front_door.xml
index 26023858d7a864463cf9169b54ac5ccabf7272bb..233390ba3931ce3dfacd0974a200dbf272f15e02 100644 (file)
--- a/res/layout/front_door.xml
+++ b/res/layout/front_door.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- \r
-* $Id: front_door.xml 97 2009-01-13 02:34:09Z rmceoin $\r
+* $Id$\r
 * \r
 * Copyright 2007-2008 Steven Osborn\r
 *\r

diff --git a/res/layout/help.xml b/res/layout/help.xml
index 4c8f47bd7c996d88823e8f36ed161d20d54389d4..79406e4dc7a48fc6f787145259fd5d3a9c21644c 100644 (file)
--- a/res/layout/help.xml
+++ b/res/layout/help.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-* $Id: help.xml 71 2008-12-28 19:42:48Z peli0101 $
+* $Id$
 * 
 * Copyright 2008 Steven Osborn and Randy McEoin
 *

diff --git a/res/layout/log_off.xml b/res/layout/log_off.xml
index 30432be155a9efa70f05f2db1e7d649f41210632..b31e69fc436f3355cf81a5997a527c02184f63e2 100644 (file)
--- a/res/layout/log_off.xml
+++ b/res/layout/log_off.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- \r
-* $Id: log_off.xml 84 2009-01-01 18:15:23Z isaac.jones $\r
+* $Id$\r
 * \r
 * Copyright 2009 Isaac Potoczny-Jones\r
 *\r

diff --git a/res/layout/pass_edit.xml b/res/layout/pass_edit.xml
index ec1ea7084a33b6cfc1e2d4b03de686ee8ab95b82..bb8b26810dd46c8ddf562963c77fd597136a2723 100644 (file)
--- a/res/layout/pass_edit.xml
+++ b/res/layout/pass_edit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- 
-* $Id: pass_edit.xml 71 2008-12-28 19:42:48Z peli0101 $\r
+* $Id$\r
 * \r
 * Copyright 2007 Steven Osborn\r
 *\r

diff --git a/res/layout/pass_gen.xml b/res/layout/pass_gen.xml
index 592fad9a37b4f4183cc17765b5b33de6645d891e..589e5974e524d6c3deab7a683c4d9db2d464b103 100644 (file)
--- a/res/layout/pass_gen.xml
+++ b/res/layout/pass_gen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- 
-* $Id: pass_edit.xml 30 2008-10-31 22:40:13Z osborn.steven $\r
+* $Id$\r
 * \r
 * Copyright 2007 Steven Osborn\r
 *\r

diff --git a/res/layout/pass_list.xml b/res/layout/pass_list.xml
index 12baa0b45a985b3da5f4ba06d1abaaa5ace7ee20..f4225492ad81a68174fbc3c2defdb90a33818e34 100644 (file)
--- a/res/layout/pass_list.xml
+++ b/res/layout/pass_list.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- \r
-* $Id: pass_list.xml 71 2008-12-28 19:42:48Z peli0101 $\r
+* $Id$\r
 * \r
 * Copyright 2007 Steven Osborn\r
 *\r

diff --git a/res/layout/pass_row.xml b/res/layout/pass_row.xml
index aa09e98cafa2336c6ad2594a6c6153864a007d14..bc58f0185e5be04924242607ed0ebeca3345e612 100644 (file)
--- a/res/layout/pass_row.xml
+++ b/res/layout/pass_row.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- \r
-* $Id: pass_row.xml 71 2008-12-28 19:42:48Z peli0101 $\r
+* $Id$\r
 * \r
 * Copyright 2007 Steven Osborn\r
 *\r

diff --git a/res/layout/restore.xml b/res/layout/restore.xml
index 0021858ff8b2445eaebaff209f9ef8e53947b9d3..64b6d9819ad7d12fd8de6808aef3638bcbc13af2 100644 (file)
--- a/res/layout/restore.xml
+++ b/res/layout/restore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: restore.xml 71 2008-12-28 19:42:48Z peli0101 $
+* $Id$
 * 
 * Copyright 2008 Steven Osborn and Randy McEoin
 *

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8de9e28cae3f0f7b226c2e4ff161b357c8bc7ec8..1addd2b56d503b7c369a2fd989eef7ddd17199b7 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- \r
-* $Id: colors.xml 71 2008-12-28 19:42:48Z peli0101 $\r
+* $Id$\r
 * \r
 * Copyright 2007 Steven Osborn\r
 *\r

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bae48981c59f14217e3b600179f5ec0d5fae3631..534d2bc09275e992290f84c2b3131d273cff3695 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- \r
-* $Id: strings.xml 98 2009-01-15 04:33:59Z rmceoin $\r
+* $Id$\r
 * \r
 * Copyright 2007 Steven Osborn\r
 *\r
@@ -144,4 +144,6 @@
        <string name="pass_gen_copy_to_current_entry">Copy to Current Entry</string>\r
        <string name="pass_gen_copy_to_clipboard">Copy to Clipboard</string>\r
        <string name="cancel">Cancel</string>\r
+       <string name="discard_changes">Discard changes</string>\r
+       <string name="entry_saved">Entry saved</string>\r
 </resources>

diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index dfee99415135fa4681cc45d1437f5640626eb63a..fe3d8e43a68fe2ea6d1bc583f5918383977c9c31 100644 (file)
--- a/src/org/openintents/safe/AskPassword.java
+++ b/src/org/openintents/safe/AskPassword.java
@@ -1,4 +1,4 @@
-/* $Id: AskPassword.java 95 2009-01-11 11:37:59Z peli0101 $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *

diff --git a/src/org/openintents/safe/Backup.java b/src/org/openintents/safe/Backup.java
index f1c4b285af81bbf6f4276600d6fb4c58ce96b1c4..ab3ef95ec7c11ef1c0205ec0375c9bda66567c3d 100644 (file)
--- a/src/org/openintents/safe/Backup.java
+++ b/src/org/openintents/safe/Backup.java
@@ -1,4 +1,4 @@
-/* $Id: Backup.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/CSVReader.java b/src/org/openintents/safe/CSVReader.java
index 5ba0f0c3036c878b9785179dad7ba3f799b29b5d..f20bfd1bb493cd8d198d96971986e78d475e30b9 100644 (file)
--- a/src/org/openintents/safe/CSVReader.java
+++ b/src/org/openintents/safe/CSVReader.java
@@ -1,4 +1,4 @@
-/* $Id: CSVReader.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  */
 package org.openintents.safe;
 \r

diff --git a/src/org/openintents/safe/CSVWriter.java b/src/org/openintents/safe/CSVWriter.java
index ab90bea1233af3e95bed1437a3832cc84270371b..2bfda74484f7fdb50f8213a33ce725ee9d07f0be 100644 (file)
--- a/src/org/openintents/safe/CSVWriter.java
+++ b/src/org/openintents/safe/CSVWriter.java
@@ -1,4 +1,4 @@
-/* $Id: CSVWriter.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  */
 
 package org.openintents.safe;

diff --git a/src/org/openintents/safe/CategoryEdit.java b/src/org/openintents/safe/CategoryEdit.java
index 8ea859029c28f417dd7793a605bfe60fb74857a1..f3879996e1eea429fd9f5e69cb90acb9276ee25c 100644 (file)
--- a/src/org/openintents/safe/CategoryEdit.java
+++ b/src/org/openintents/safe/CategoryEdit.java
@@ -1,4 +1,4 @@
-/* $Id: CategoryEdit.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/CategoryEntry.java b/src/org/openintents/safe/CategoryEntry.java
index 70c38310c6adf9babe7cd56ca47bb99ee17e2931..5a9d69c7236faaedec7a75aae036f4eae6a15b9c 100644 (file)
--- a/src/org/openintents/safe/CategoryEntry.java
+++ b/src/org/openintents/safe/CategoryEntry.java
@@ -1,4 +1,4 @@
-/* $Id: CategoryEntry.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index bcd239b4bd5f55bbdf8437281c2a0ff609762546..0cb90a1f91612b2a192dd77684b16ae3bba11ae7 100644 (file)
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -1,4 +1,4 @@
-/* $Id: CategoryList.java 98 2009-01-15 04:33:59Z rmceoin $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/ChangePass.java b/src/org/openintents/safe/ChangePass.java
index fd949f35e15a4c27325c665b2a36c91be8deb08c..b64dca6e6594f9e103a51c7c9b0489752392cfeb 100644 (file)
--- a/src/org/openintents/safe/ChangePass.java
+++ b/src/org/openintents/safe/ChangePass.java
@@ -1,4 +1,4 @@
-/* $Id: ChangePass.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/CryptoHelper.java b/src/org/openintents/safe/CryptoHelper.java
index 56736cde9daa58f7538872bf4d2e6a4afc5c4adf..3da0d185f9f0d25fa5933c87619265c476e6c686 100644 (file)
--- a/src/org/openintents/safe/CryptoHelper.java
+++ b/src/org/openintents/safe/CryptoHelper.java
@@ -1,4 +1,4 @@
-/* $Id: CryptoHelper.java 78 2008-12-31 21:47:07Z peli0101 $\r
+/* $Id$\r
  * \r
  * Copyright 2007-2008 Steven Osborn\r
  *\r

diff --git a/src/org/openintents/safe/CryptoHelperException.java b/src/org/openintents/safe/CryptoHelperException.java
index 2a1f0e5e6c4bae3ade97e15de2002abbb5bebc21..66e2df9f9cd88e27e13103b6fff88ae7dc1eb8d2 100644 (file)
--- a/src/org/openintents/safe/CryptoHelperException.java
+++ b/src/org/openintents/safe/CryptoHelperException.java
@@ -1,4 +1,4 @@
-/* $Id: CryptoHelperException.java 71 2008-12-28 19:42:48Z peli0101 $\r
+/* $Id$\r
  * \r
  * Copyright 2007-2008 Steven Osborn\r
  *\r

diff --git a/src/org/openintents/safe/DBHelper.java b/src/org/openintents/safe/DBHelper.java
index 635dd949fafeef7775e3b683cbeadc2f12a0293e..d1ddcdb917ee1290d5076075094607aefaad87da 100644 (file)
--- a/src/org/openintents/safe/DBHelper.java
+++ b/src/org/openintents/safe/DBHelper.java
@@ -1,4 +1,4 @@
-/* $Id: DBHelper.java 97 2009-01-13 02:34:09Z rmceoin $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *

diff --git a/src/org/openintents/safe/FrontDoor.java b/src/org/openintents/safe/FrontDoor.java
index a15ff769614c18831d10c71d2f376e1e2e230415..7eae41147b4caa6cdcf55db9406c78500dc7983b 100644 (file)
--- a/src/org/openintents/safe/FrontDoor.java
+++ b/src/org/openintents/safe/FrontDoor.java
@@ -1,4 +1,4 @@
-/* $Id: FrontDoor.java 98 2009-01-15 04:33:59Z rmceoin $\r
+/* $Id$\r
  * \r
  * Copyright 2007-2008 Steven Osborn\r
  *\r

diff --git a/src/org/openintents/safe/Help.java b/src/org/openintents/safe/Help.java
index 08f3e2c0de2a7d742af1b20b4589e0df14223a42..4f8e62fdbadfa55831f076c68e03fd175293d4d5 100644 (file)
--- a/src/org/openintents/safe/Help.java
+++ b/src/org/openintents/safe/Help.java
@@ -1,4 +1,4 @@
-/* $Id: Help.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Steven Osborn and Randy McEoin
  *

diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java
index 58cf7f54c26955ac399563bdbb1a3929b43e9661..0640839569743aa70c867b9acba0e4bb5b6eeeca 100644 (file)
--- a/src/org/openintents/safe/PassEdit.java
+++ b/src/org/openintents/safe/PassEdit.java
@@ -1,4 +1,4 @@
-/* $Id: PassEdit.java 93 2009-01-05 08:14:22Z isaac.jones $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *
@@ -46,7 +46,8 @@ public class PassEdit extends Activity {
 
        public static final int SAVE_PASSWORD_INDEX = Menu.FIRST;
        public static final int DEL_PASSWORD_INDEX = Menu.FIRST + 1;
-       public static final int GEN_PASSWORD_INDEX = Menu.FIRST + 2;
+       public static final int DISCARD_PASSWORD_INDEX = Menu.FIRST + 2;
+       public static final int GEN_PASSWORD_INDEX = Menu.FIRST + 3;
 
        private EditText descriptionText;
        private EditText passwordText;
@@ -144,6 +145,8 @@ public class PassEdit extends Activity {
        protected void onPause() {
                super.onPause();
                saveState();
+               Toast.makeText(PassEdit.this, R.string.entry_saved,
+                       Toast.LENGTH_SHORT).show();
                dbHelper.close();
                dbHelper = null;
        }
@@ -201,7 +204,9 @@ public class PassEdit extends Activity {
                menu.add(0, SAVE_PASSWORD_INDEX, 0, R.string.save).setIcon(
                                android.R.drawable.ic_menu_save).setShortcut('1', 's');
                menu.add(0, DEL_PASSWORD_INDEX, 0, R.string.password_delete).setIcon(
-                               android.R.drawable.ic_menu_delete).setShortcut('3', 'd');
+                               android.R.drawable.ic_menu_delete);
+               menu.add(0, DISCARD_PASSWORD_INDEX, 0, R.string.discard_changes).setIcon(
+                               android.R.drawable.ic_notification_clear_all);
                menu.add(0, GEN_PASSWORD_INDEX, 0, "Generate").setIcon(
                                android.R.drawable.ic_menu_set_as).setShortcut('4', 'g');
 
@@ -213,6 +218,8 @@ public class PassEdit extends Activity {
         */
        private void savePassword() {
                saveState();
+               Toast.makeText(PassEdit.this, R.string.entry_saved,
+                       Toast.LENGTH_SHORT).show();
                setResult(RESULT_OK);
                finish();
        }
@@ -276,6 +283,9 @@ public class PassEdit extends Activity {
                case DEL_PASSWORD_INDEX:
                        deletePassword();
                        break;
+               case DISCARD_PASSWORD_INDEX:
+                       finish();
+                       break;
                case GEN_PASSWORD_INDEX:
                        Intent i = new Intent(getApplicationContext(), PassGen.class);
                        startActivityForResult(i, REQUEST_GEN_PASS);

diff --git a/src/org/openintents/safe/PassEntry.java b/src/org/openintents/safe/PassEntry.java
index 8b3f7b18dece5bb0a154f2d6ac690db641293403..4a2606a3ddac9287090b0bd9ef5c67a881f3861f 100644 (file)
--- a/src/org/openintents/safe/PassEntry.java
+++ b/src/org/openintents/safe/PassEntry.java
@@ -1,4 +1,4 @@
-/* $Id: PassEntry.java 93 2009-01-05 08:14:22Z isaac.jones $\r
+/* $Id$\r
  * \r
  * Copyright 2007-2008 Steven Osborn\r
  *\r

diff --git a/src/org/openintents/safe/PassGen.java b/src/org/openintents/safe/PassGen.java
index 602ec37976322dfaaf104d590016fa24cd11369d..49840fff7638a1aba1f8c10153398a0c6afae28b 100644 (file)
--- a/src/org/openintents/safe/PassGen.java
+++ b/src/org/openintents/safe/PassGen.java
@@ -1,4 +1,4 @@
-/* $Id: PassGen.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *

diff --git a/src/org/openintents/safe/PassList.java b/src/org/openintents/safe/PassList.java
index 2e639cea07569094f7073470cf3ac3ade4998e67..2c8b759ac9a1171d44522115b20907d1acee5f15 100644 (file)
--- a/src/org/openintents/safe/PassList.java
+++ b/src/org/openintents/safe/PassList.java
@@ -1,4 +1,4 @@
-/* $Id: PassList.java 97 2009-01-13 02:34:09Z rmceoin $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *

diff --git a/src/org/openintents/safe/Restore.java b/src/org/openintents/safe/Restore.java
index efdcb07c6a5a20b13224c9b155e083f39d41919b..0cef10bf4ab7e5494715236bd71d69137bfb973e 100644 (file)
--- a/src/org/openintents/safe/Restore.java
+++ b/src/org/openintents/safe/Restore.java
@@ -1,4 +1,4 @@
-/* $Id: Restore.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/RestoreDataSet.java b/src/org/openintents/safe/RestoreDataSet.java
index 2512550dce76b6cc5aa9f0efa0aa2c3ce07c4e0c..5bfab40a1effc0f71654814cefb6ff61f18f63d8 100644 (file)
--- a/src/org/openintents/safe/RestoreDataSet.java
+++ b/src/org/openintents/safe/RestoreDataSet.java
@@ -1,4 +1,4 @@
-/* $Id: RestoreDataSet.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/RestoreHandler.java b/src/org/openintents/safe/RestoreHandler.java
index d13795e6e6c7cef2b17a887ce470394e0e7f5fee..91122975ef6a799983b5ff6ded5137b8c523b41b 100644 (file)
--- a/src/org/openintents/safe/RestoreHandler.java
+++ b/src/org/openintents/safe/RestoreHandler.java
@@ -1,4 +1,4 @@
-/* $Id: RestoreHandler.java 71 2008-12-28 19:42:48Z peli0101 $
+/* $Id$
  * 
  * Copyright 2008 Randy McEoin
  *

diff --git a/src/org/openintents/safe/service/ServiceDispatchImpl.java b/src/org/openintents/safe/service/ServiceDispatchImpl.java
index 6e1b02752bb6953e2521d971526c636b92624887..97a1c29441b67332e73ec4d2dca3381d8a53d01a 100644 (file)
--- a/src/org/openintents/safe/service/ServiceDispatchImpl.java
+++ b/src/org/openintents/safe/service/ServiceDispatchImpl.java
@@ -1,4 +1,4 @@
-/* $Id: $
+/* $Id$
  * 
  * Copyright 2008 Isaac Potoczny-Jones
  *