From: rmceoin Date: Sun, 4 Oct 2009 00:09:44 +0000 (+0000) Subject: OI Safe: added better state handling in CategoryEdit and PassEdit X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=10e0e9b66464433c6239e6e7a209f07b0a7165d9;p=android-vcpass-oisafe OI Safe: added better state handling in CategoryEdit and PassEdit git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2314 72b678ce-9140-0410-bee8-679b907dd61a --- diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java index 2548929..29045ad 100644 --- a/src/org/openintents/safe/AskPassword.java +++ b/src/org/openintents/safe/AskPassword.java @@ -53,7 +53,7 @@ import android.widget.Toast; */ public class AskPassword extends Activity { - private boolean debug = true; + private boolean debug = false; private static String TAG = "AskPassword"; public static String EXTRA_IS_LOCAL = "org.openintents.safe.bundle.EXTRA_IS_REMOTE"; diff --git a/src/org/openintents/safe/CategoryEdit.java b/src/org/openintents/safe/CategoryEdit.java index 25832dd..12592e0 100644 --- a/src/org/openintents/safe/CategoryEdit.java +++ b/src/org/openintents/safe/CategoryEdit.java @@ -42,10 +42,11 @@ public class CategoryEdit extends Activity { private EditText nameText; private Long RowId; + boolean populated = false; Intent frontdoor; private Intent restartTimerIntent=null; - + BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { public void onReceive(Context context, Intent intent) { if (intent.getAction().equals(CryptoIntents.ACTION_CRYPTO_LOGGED_OUT)) { @@ -99,7 +100,6 @@ public class CategoryEdit extends Activity { }); } - @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); @@ -110,6 +110,16 @@ public class CategoryEdit extends Activity { } } + @Override + protected void onRestoreInstanceState(Bundle inState) { + super.onRestoreInstanceState(inState); + + if (debug) Log.d(TAG,"onRestoreInstanceState("+inState+")"); + // because the various EditText automatically handle state + // when we come back there is no need to re-populate + populated=true; + } + @Override protected void onPause() { super.onPause(); @@ -127,7 +137,6 @@ public class CategoryEdit extends Activity { super.onResume(); if (debug) Log.d(TAG, "onResume"); if (!CategoryList.isSignedIn()) { - Intent frontdoor = new Intent(this, FrontDoor.class); startActivity(frontdoor); return; } @@ -161,6 +170,9 @@ public class CategoryEdit extends Activity { */ private void populateFields() { if (debug) Log.d(TAG, "populateFields"); + if (populated) { + return; + } if ((RowId != null) && (RowId > 0)) { CategoryEntry catEntry = Passwords.getCategoryEntry(RowId); if (catEntry==null) { @@ -168,6 +180,7 @@ public class CategoryEdit extends Activity { } nameText.setText(catEntry.plainName); } + populated=true; } @Override diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java index 65be2ff..0c0a9d1 100644 --- a/src/org/openintents/safe/CategoryList.java +++ b/src/org/openintents/safe/CategoryList.java @@ -68,7 +68,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo; */ public class CategoryList extends ListActivity { - private static boolean debug = true; + private static boolean debug = false; private static final String TAG = "CategoryList"; // Menu Item order diff --git a/src/org/openintents/safe/IntentHandler.java b/src/org/openintents/safe/IntentHandler.java index a49f1a0..c0f2fe2 100644 --- a/src/org/openintents/safe/IntentHandler.java +++ b/src/org/openintents/safe/IntentHandler.java @@ -49,7 +49,7 @@ import android.widget.Toast; */ public class IntentHandler extends Activity { - private static final boolean debug = true; + private static final boolean debug = false; private static String TAG = "IntentHandler"; private static final int REQUEST_CODE_ASK_PASSWORD = 1; diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java index 243efa7..0dcffad 100644 --- a/src/org/openintents/safe/PassEdit.java +++ b/src/org/openintents/safe/PassEdit.java @@ -47,7 +47,7 @@ import android.widget.Toast; */ public class PassEdit extends Activity { - private static boolean debug = true; + private static boolean debug = false; private static String TAG = "PassEdit"; public static final int REQUEST_GEN_PASS = 10; @@ -206,9 +206,9 @@ public class PassEdit extends Activity { if (debug) Log.d(TAG,"onResume()"); if (CategoryList.isSignedIn()==false) { - if (Passwords.isCryptoInitialized()) { - saveState(); - } +// if (Passwords.isCryptoInitialized()) { +// saveState(); +// } startActivity(frontdoor); return; } @@ -407,19 +407,6 @@ public class PassEdit extends Activity { } } - /** - * Get the text from an EditText field. - * - * @param e EditText to retrieve text from. - * @return The field's text. If e==null returns null. - */ - private String getTextFromField(EditText e) { - if (e==null) { - return null; - } - return e.getText().toString(); - } - @Override public void onUserInteraction() { super.onUserInteraction(); diff --git a/src/org/openintents/safe/PassList.java b/src/org/openintents/safe/PassList.java index 8da645a..866fc55 100644 --- a/src/org/openintents/safe/PassList.java +++ b/src/org/openintents/safe/PassList.java @@ -61,7 +61,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo; */ public class PassList extends ListActivity { - private static final boolean debug = true; + private static final boolean debug = false; private static final String TAG = "PassList"; // Menu Item order diff --git a/src/org/openintents/safe/PassView.java b/src/org/openintents/safe/PassView.java index ef000b9..aa6a5d2 100644 --- a/src/org/openintents/safe/PassView.java +++ b/src/org/openintents/safe/PassView.java @@ -50,7 +50,7 @@ import android.widget.Toast; */ public class PassView extends Activity implements View.OnClickListener { - private static boolean debug = true; + private static boolean debug = false; private static String TAG = "PassView"; public static final int EDIT_PASSWORD_INDEX = Menu.FIRST; diff --git a/src/org/openintents/safe/Passwords.java b/src/org/openintents/safe/Passwords.java index b8e3d32..0b8beb6 100644 --- a/src/org/openintents/safe/Passwords.java +++ b/src/org/openintents/safe/Passwords.java @@ -40,7 +40,7 @@ import android.widget.Toast; */ public class Passwords { - private static final boolean debug = true; + private static final boolean debug = false; private static final String TAG = "Passwords"; private static HashMap passEntries=null;