From 198d58c3b1310ffa5de3fb9fee70a436013ab44b Mon Sep 17 00:00:00 2001 From: peli0101 Date: Sat, 17 Jan 2009 06:31:58 +0000 Subject: [PATCH] OI Safe: Fix issue 179: getSetPassword was called before onResume(), therefore dbHelper was still null. git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1743 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 74d3c6f..6bc6cf7 100644 --- a/src/org/openintents/safe/FrontDoor.java +++ b/src/org/openintents/safe/FrontDoor.java @@ -129,12 +129,12 @@ public class FrontDoor extends Activity { callbackIntent = getSetPassword (thisIntent, callbackIntent); callbackResult = RESULT_OK; } catch (CryptoHelperException e) { - Log.e(TAG, e.toString()); + Log.e(TAG, e.toString(), e); Toast.makeText(FrontDoor.this, "There was a crypto error while retreiving the requested password: " + e.getMessage(), Toast.LENGTH_SHORT).show(); } catch (Exception e) { - Log.e(TAG, e.toString()); + Log.e(TAG, e.toString(), e); //TODO: Turn this into a proper error dialog. Toast.makeText(FrontDoor.this, "There was an error in retreiving the requested password: " + e.getMessage(), @@ -237,6 +237,12 @@ public class FrontDoor extends Activity { String clearUniqueName = thisIntent.getStringExtra (CryptoIntents.EXTRA_UNIQUE_NAME); if (clearUniqueName == null) throw new Exception ("EXTRA_UNIQUE_NAME not set."); + + if (dbHelper == null) { + // Need to open DBHelper here, because + // onResume() is called after onActivityResult() + dbHelper = new DBHelper(this); + } String uniqueName = ch.encrypt(clearUniqueName); PassEntry row = dbHelper.fetchPassword(uniqueName); -- 2.50.1