From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sun, 18 Jan 2009 02:56:53 +0000 (+0000)
Subject: Discard actually discards now.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=89ac0c80234e4b79cc7a8affad2c6afe88830cb3;p=android-vcpass-oisafe

Discard actually discards now.


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

diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java
index 0640839..6ab139c 100644
--- a/src/org/openintents/safe/PassEdit.java
+++ b/src/org/openintents/safe/PassEdit.java
@@ -58,6 +58,7 @@ public class PassEdit extends Activity {
 	private DBHelper dbHelper = null;
 	private CryptoHelper ch;
 	private boolean pass_gen_ret = false;
+	private boolean discardEntry = false;
 	
 	private static boolean debug = false;
 	private static String TAG = "PassEdit";
@@ -144,9 +145,9 @@ public class PassEdit extends Activity {
 	@Override
 	protected void onPause() {
 		super.onPause();
-		saveState();
-		Toast.makeText(PassEdit.this, R.string.entry_saved,
-			Toast.LENGTH_SHORT).show();
+		if (discardEntry==false) {
+			savePassword();
+		}
 		dbHelper.close();
 		dbHelper = null;
 	}
@@ -221,7 +222,6 @@ public class PassEdit extends Activity {
 		Toast.makeText(PassEdit.this, R.string.entry_saved,
 			Toast.LENGTH_SHORT).show();
 		setResult(RESULT_OK);
-		finish();
 	}
 
 	/**
@@ -279,11 +279,13 @@ public class PassEdit extends Activity {
 		switch (item.getItemId()) {
 		case SAVE_PASSWORD_INDEX:
 			savePassword();
+			finish();
 			break;
 		case DEL_PASSWORD_INDEX:
 			deletePassword();
 			break;
 		case DISCARD_PASSWORD_INDEX:
+			discardEntry=true;
 			finish();
 			break;
 		case GEN_PASSWORD_INDEX: