From 28c114707834f785cb88f0c421a033a07c4b2e93 Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Tue, 3 Feb 2009 01:29:32 +0000
Subject: [PATCH] OI Safe: fixed i205, deleting password at PassEdit now drops
 user back to PassList instead of PassView.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1905 72b678ce-9140-0410-bee8-679b907dd61a
---
 src/org/openintents/safe/PassEdit.java | 5 ++++-
 src/org/openintents/safe/PassView.java | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java
index 502550c..1f180e0 100644
--- a/src/org/openintents/safe/PassEdit.java
+++ b/src/org/openintents/safe/PassEdit.java
@@ -52,6 +52,8 @@ public class PassEdit extends Activity {
 	public static final int DISCARD_PASSWORD_INDEX = Menu.FIRST + 2;
 	public static final int GEN_PASSWORD_INDEX = Menu.FIRST + 3;
 
+	public static final int RESULT_DELETED = RESULT_FIRST_USER;
+	
 	private EditText descriptionText;
 	private EditText passwordText;
 	private EditText usernameText;
@@ -274,7 +276,8 @@ public class PassEdit extends Activity {
 	 */
 	private void delPassword(long Id) {
 		dbHelper.deletePassword(Id);
-		setResult(RESULT_OK);
+		discardEntry=true;
+		setResult(RESULT_DELETED);
 		finish();
 	}
 
diff --git a/src/org/openintents/safe/PassView.java b/src/org/openintents/safe/PassView.java
index 21f6186..70877fa 100644
--- a/src/org/openintents/safe/PassView.java
+++ b/src/org/openintents/safe/PassView.java
@@ -35,7 +35,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -269,6 +268,10 @@ public class PassView extends Activity {
 
 		if (debug) Log.d(TAG,"onActivityResult()");
 		if (requestCode == REQUEST_EDIT_PASS) {
+	    	if (resultCode==PassEdit.RESULT_DELETED) {
+				entryEdited=true;
+	    		finish();
+	    	}
 			if ((resultCode == RESULT_OK) || (PassEdit.entryEdited)){
 				populateFields();
 				entryEdited=true;
-- 
2.50.1