PassList now updates list upon return from updated PassEdit.

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

diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java
index a137bb7d9c034b75f06b57f4e15bb09e88c9a68d..8fe75370a93c4441c99c1058efd700578871aa31 100644 (file)
--- a/src/org/openintents/safe/PassEdit.java
+++ b/src/org/openintents/safe/PassEdit.java
@@ -62,6 +62,7 @@ public class PassEdit extends Activity {
        private CryptoHelper ch;
        private boolean pass_gen_ret = false;
        private boolean discardEntry = false;
+       public static boolean entryEdited = false;
 
        public void onCreate(Bundle icicle) {
                super.onCreate(icicle);
@@ -94,7 +95,7 @@ public class PassEdit extends Activity {
                        RowId = extras != null ? extras.getLong(PassList.KEY_ID) : null;
                }
 
-//             populateFields();
+               entryEdited = false;
 
                goButton.setOnClickListener(new View.OnClickListener() {
                        public void onClick(View arg0) {
@@ -175,6 +176,8 @@ public class PassEdit extends Activity {
                        Log.e(TAG, e.toString());
                }
 
+               entryEdited = true;
+
                if (RowId == null || RowId == -1) {
                        RowId = dbHelper.addPassword(entry);
                } else {

diff --git a/src/org/openintents/safe/PassList.java b/src/org/openintents/safe/PassList.java
index a994aac2c51c96a78928637c2eeca366c082b9cb..8103e43cd376040d14ccf5f5050a4d975a9e8340 100644 (file)
--- a/src/org/openintents/safe/PassList.java
+++ b/src/org/openintents/safe/PassList.java
@@ -401,12 +401,11 @@ public class PassList extends ListActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent i) {
        super.onActivityResult(requestCode, resultCode, i);
 
-       if (debug) Log.d(TAG,"onActivityResult: requestCode="+requestCode+", resultCode="+resultCode+
-                       ", entryEdited="+PassView.entryEdited);
        if (dbHelper == null) {
                    dbHelper = new DBHelper(this);
                }
        if (((requestCode==REQUEST_VIEW_PASSWORD)&&(PassView.entryEdited)) ||
+               ((requestCode==REQUEST_EDIT_PASSWORD)&&(PassEdit.entryEdited)) ||
                        (resultCode==RESULT_OK)) {
                fillData();
        }

diff --git a/src/org/openintents/safe/PassView.java b/src/org/openintents/safe/PassView.java
index 0753ebd1e2ca5de156864d5faa04727cae28bc7b..e9d58f1a13fd541096ab784150845d0564b7836d 100644 (file)
--- a/src/org/openintents/safe/PassView.java
+++ b/src/org/openintents/safe/PassView.java
@@ -100,6 +100,8 @@ public class PassView extends Activity {
                        CategoryId = extras != null ? extras.getLong(PassList.KEY_CATEGORY_ID) : null;
                }
 
+               populateFields();
+
                goButton.setOnClickListener(new View.OnClickListener() {
                        public void onClick(View arg0) {
 
@@ -153,7 +155,7 @@ public class PassView extends Activity {
                if (CategoryList.isSignedIn() == false) {
                        finish();
                }
-               populateFields();
+//             populateFields();
        }
 
        @Override
@@ -242,9 +244,11 @@ public class PassView extends Activity {
                super.onActivityResult(requestCode, resultCode, i);
 
                if (debug) Log.d(TAG,"onActivityResult()");
-               if (resultCode == RESULT_OK) {
-                       populateFields();
-                       entryEdited=true;
+               if (requestCode == REQUEST_EDIT_PASS) {
+                       if ((resultCode == RESULT_OK) || (PassEdit.entryEdited)){
+                               populateFields();
+                               entryEdited=true;
+                       }
                }
        }