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

diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java
index 502550ca84bb4468262cdede509185e4ec912afa..1f180e0d57fcd9a755157fc0d730dcb37f87ff40 100644 (file)
--- 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 21f618687932d8c00e9340c56c6b3d50a6ab9af8..70877fab7d48462e2b791b4a3c33167622a81532 100644 (file)
--- 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;