From 4194ca1f0443d88e32352253562a1fc13efb07db Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sun, 18 Jan 2009 01:57:44 +0000
Subject: [PATCH] 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
---
 res/layout-land/front_door.xml                   |  2 +-
 res/layout/chg_pass.xml                          |  2 +-
 res/layout/front_door.xml                        |  2 +-
 res/layout/help.xml                              |  2 +-
 res/layout/log_off.xml                           |  2 +-
 res/layout/pass_edit.xml                         |  2 +-
 res/layout/pass_gen.xml                          |  2 +-
 res/layout/pass_list.xml                         |  2 +-
 res/layout/pass_row.xml                          |  2 +-
 res/layout/restore.xml                           |  2 +-
 res/values/colors.xml                            |  2 +-
 res/values/strings.xml                           |  4 +++-
 src/org/openintents/safe/AskPassword.java        |  2 +-
 src/org/openintents/safe/Backup.java             |  2 +-
 src/org/openintents/safe/CSVReader.java          |  2 +-
 src/org/openintents/safe/CSVWriter.java          |  2 +-
 src/org/openintents/safe/CategoryEdit.java       |  2 +-
 src/org/openintents/safe/CategoryEntry.java      |  2 +-
 src/org/openintents/safe/CategoryList.java       |  2 +-
 src/org/openintents/safe/ChangePass.java         |  2 +-
 src/org/openintents/safe/CryptoHelper.java       |  2 +-
 .../openintents/safe/CryptoHelperException.java  |  2 +-
 src/org/openintents/safe/DBHelper.java           |  2 +-
 src/org/openintents/safe/FrontDoor.java          |  2 +-
 src/org/openintents/safe/Help.java               |  2 +-
 src/org/openintents/safe/PassEdit.java           | 16 +++++++++++++---
 src/org/openintents/safe/PassEntry.java          |  2 +-
 src/org/openintents/safe/PassGen.java            |  2 +-
 src/org/openintents/safe/PassList.java           |  2 +-
 src/org/openintents/safe/Restore.java            |  2 +-
 src/org/openintents/safe/RestoreDataSet.java     |  2 +-
 src/org/openintents/safe/RestoreHandler.java     |  2 +-
 .../safe/service/ServiceDispatchImpl.java        |  2 +-
 33 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/res/layout-land/front_door.xml b/res/layout-land/front_door.xml
index d141870..173f049 100644
--- 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"?>
 <!-- 
-* $Id: front_door.xml 97 2009-01-13 02:34:09Z rmceoin $
+* $Id$
 * 
 * Copyright 2008 Steven Osborn & Randy McEoin
 *
diff --git a/res/layout/chg_pass.xml b/res/layout/chg_pass.xml
index ab0fa2c..b0b2828 100644
--- 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 2602385..233390b 100644
--- a/res/layout/front_door.xml
+++ b/res/layout/front_door.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: front_door.xml 97 2009-01-13 02:34:09Z rmceoin $
+* $Id$
 * 
 * Copyright 2007-2008 Steven Osborn
 *
diff --git a/res/layout/help.xml b/res/layout/help.xml
index 4c8f47b..79406e4 100644
--- 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 30432be..b31e69f 100644
--- a/res/layout/log_off.xml
+++ b/res/layout/log_off.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: log_off.xml 84 2009-01-01 18:15:23Z isaac.jones $
+* $Id$
 * 
 * Copyright 2009 Isaac Potoczny-Jones
 *
diff --git a/res/layout/pass_edit.xml b/res/layout/pass_edit.xml
index ec1ea70..bb8b268 100644
--- a/res/layout/pass_edit.xml
+++ b/res/layout/pass_edit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: pass_edit.xml 71 2008-12-28 19:42:48Z peli0101 $
+* $Id$
 * 
 * Copyright 2007 Steven Osborn
 *
diff --git a/res/layout/pass_gen.xml b/res/layout/pass_gen.xml
index 592fad9..589e597 100644
--- a/res/layout/pass_gen.xml
+++ b/res/layout/pass_gen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: pass_edit.xml 30 2008-10-31 22:40:13Z osborn.steven $
+* $Id$
 * 
 * Copyright 2007 Steven Osborn
 *
diff --git a/res/layout/pass_list.xml b/res/layout/pass_list.xml
index 12baa0b..f422549 100644
--- a/res/layout/pass_list.xml
+++ b/res/layout/pass_list.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: pass_list.xml 71 2008-12-28 19:42:48Z peli0101 $
+* $Id$
 * 
 * Copyright 2007 Steven Osborn
 *
diff --git a/res/layout/pass_row.xml b/res/layout/pass_row.xml
index aa09e98..bc58f01 100644
--- a/res/layout/pass_row.xml
+++ b/res/layout/pass_row.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: pass_row.xml 71 2008-12-28 19:42:48Z peli0101 $
+* $Id$
 * 
 * Copyright 2007 Steven Osborn
 *
diff --git a/res/layout/restore.xml b/res/layout/restore.xml
index 0021858..64b6d98 100644
--- 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 8de9e28..1addd2b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: colors.xml 71 2008-12-28 19:42:48Z peli0101 $
+* $Id$
 * 
 * Copyright 2007 Steven Osborn
 *
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bae4898..534d2bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-* $Id: strings.xml 98 2009-01-15 04:33:59Z rmceoin $
+* $Id$
 * 
 * Copyright 2007 Steven Osborn
 *
@@ -144,4 +144,6 @@
 	<string name="pass_gen_copy_to_current_entry">Copy to Current Entry</string>
 	<string name="pass_gen_copy_to_clipboard">Copy to Clipboard</string>
 	<string name="cancel">Cancel</string>
+	<string name="discard_changes">Discard changes</string>
+	<string name="entry_saved">Entry saved</string>
 </resources>
diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index dfee994..fe3d8e4 100644
--- 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 f1c4b28..ab3ef95 100644
--- 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 5ba0f0c..f20bfd1 100644
--- 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;
 
diff --git a/src/org/openintents/safe/CSVWriter.java b/src/org/openintents/safe/CSVWriter.java
index ab90bea..2bfda74 100644
--- 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 8ea8590..f387999 100644
--- 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 70c3831..5a9d69c 100644
--- 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 bcd239b..0cb90a1 100644
--- 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 fd949f3..b64dca6 100644
--- 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 56736cd..3da0d18 100644
--- 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 $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *
diff --git a/src/org/openintents/safe/CryptoHelperException.java b/src/org/openintents/safe/CryptoHelperException.java
index 2a1f0e5..66e2df9 100644
--- 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 $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *
diff --git a/src/org/openintents/safe/DBHelper.java b/src/org/openintents/safe/DBHelper.java
index 635dd94..d1ddcdb 100644
--- 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 a15ff76..7eae411 100644
--- 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 $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *
diff --git a/src/org/openintents/safe/Help.java b/src/org/openintents/safe/Help.java
index 08f3e2c..4f8e62f 100644
--- 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 58cf7f5..0640839 100644
--- 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 8b3f7b1..4a2606a 100644
--- 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 $
+/* $Id$
  * 
  * Copyright 2007-2008 Steven Osborn
  *
diff --git a/src/org/openintents/safe/PassGen.java b/src/org/openintents/safe/PassGen.java
index 602ec37..49840ff 100644
--- 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 2e639ce..2c8b759 100644
--- 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 efdcb07..0cef10b 100644
--- 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 2512550..5bfab40 100644
--- 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 d13795e..9112297 100644
--- 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 6e1b027..97a1c29 100644
--- 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
  *
-- 
2.50.1