From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sun, 26 Apr 2009 18:30:28 +0000 (+0000)
Subject: OI Safe: Return same session key as CryptoContentProvider.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=387689e5c9920127eb05945b089e5a0573e09159;p=android-vcpass-oisafe

OI Safe: Return same session key as CryptoContentProvider.

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

diff --git a/src/org/openintents/intents/CryptoIntents.java b/src/org/openintents/intents/CryptoIntents.java
index 228ead8..7ef5bb7 100644
--- a/src/org/openintents/intents/CryptoIntents.java
+++ b/src/org/openintents/intents/CryptoIntents.java
@@ -16,7 +16,7 @@
 package org.openintents.intents;
 
 /**
- * @version March 29, 2009, 22:26 UTC
+ * @version 1.1.1
  * 
  * @author Isaac Potoczny-Jones
  * @author Peli
diff --git a/src/org/openintents/safe/CryptoHelper.java b/src/org/openintents/safe/CryptoHelper.java
index 3f64c88..24c52d9 100644
--- a/src/org/openintents/safe/CryptoHelper.java
+++ b/src/org/openintents/safe/CryptoHelper.java
@@ -41,6 +41,7 @@ import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.PBEParameterSpec;
 
+import org.openintents.safe.service.ServiceDispatchImpl;
 import org.openintents.util.SecureDelete;
 
 import android.content.ContentResolver;
@@ -306,7 +307,11 @@ public class CryptoHelper {
      * @return current session key.
      */
     public String getCurrentSessionKey() {
-    	return sessionKey;
+    	//return sessionKey;
+    	
+    	return ServiceDispatchImpl.ch.sessionKey;  // Return a global session key created in ServiceDispatchImpl
+    	// This should be the same session key as is used in CryptoContentProvider.
+    	// TODO: Clean up the code above?
     }
     
     /**