From c49745220132199ea1f07ec3059ff124b6d0cfc5 Mon Sep 17 00:00:00 2001 From: peli0101 Date: Sat, 17 Jan 2009 10:15:54 +0000 Subject: [PATCH] Include direct connection via service. git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1746 72b678ce-9140-0410-bee8-679b907dd61a --- src/org/openintents/safe/FrontDoor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/openintents/safe/FrontDoor.java b/src/org/openintents/safe/FrontDoor.java index 6bc6cf7..c4b8e74 100644 --- a/src/org/openintents/safe/FrontDoor.java +++ b/src/org/openintents/safe/FrontDoor.java @@ -47,7 +47,7 @@ import android.widget.Toast; */ public class FrontDoor extends Activity { - private boolean debug = false; + private static final boolean debug = !false; private static String TAG = "FrontDoor"; private DBHelper dbHelper; @@ -155,6 +155,9 @@ public class FrontDoor extends Activity { * @return callbackResult */ private int encryptIntent(final Intent thisIntent, Intent callbackIntent) { + if (debug) + Log.d(TAG, "encryptIntent()"); + int callbackResult = RESULT_CANCELED; try { if (thisIntent.hasExtra(CryptoIntents.EXTRA_TEXT)) { @@ -372,10 +375,11 @@ public class FrontDoor extends Activity { service = ServiceDispatch.Stub.asInterface((IBinder)boundService); boolean promptforpassword = getIntent().getBooleanExtra(CryptoIntents.EXTRA_PROMPT, true); - + if (debug) Log.d(TAG, "Prompt for password: " + promptforpassword); try { if (service.getPassword() == null) { if (promptforpassword) { + if (debug) Log.d(TAG, "ask for password"); // the service isn't running Intent askPass = new Intent(getApplicationContext(), AskPassword.class); @@ -388,12 +392,14 @@ public class FrontDoor extends Activity { //TODO: Is there a way to make sure all the extras are set? startActivityForResult (askPass, 0); } else { + if (debug) Log.d(TAG, "ask for password"); // Don't prompt but cancel setResult(RESULT_CANCELED); finish(); } } else { + if (debug) Log.d(TAG, "service already started"); //service already started, so don't need to ask pw. masterKey = service.getPassword(); actionDispatch(); -- 2.50.1