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 228ead84a7e8507023342e1814559be41f6e4138..7ef5bb7a2eeddd10418982b2b8a5a4a098633263 100644 (file)
--- a/src/org/openintents/intents/CryptoIntents.java
+++ b/src/org/openintents/intents/CryptoIntents.java
@@ -16,7 +16,7 @@
 package org.openintents.intents;\r
 \r
 /**\r
- * @version March 29, 2009, 22:26 UTC\r
+ * @version 1.1.1\r
  * \r
  * @author Isaac Potoczny-Jones\r
  * @author Peli\r

diff --git a/src/org/openintents/safe/CryptoHelper.java b/src/org/openintents/safe/CryptoHelper.java
index 3f64c882c7a99edf1a3de57a7c5aaab46c007855..24c52d921d499c18e63e1590405dfef90d79df3a 100644 (file)
--- 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;\r
 import javax.crypto.spec.PBEParameterSpec;\r
 \r
+import org.openintents.safe.service.ServiceDispatchImpl;\r
 import org.openintents.util.SecureDelete;\r
 \r
 import android.content.ContentResolver;\r
@@ -306,7 +307,11 @@ public class CryptoHelper {
      * @return current session key.\r
      */\r
     public String getCurrentSessionKey() {\r
-       return sessionKey;\r
+       //return sessionKey;\r
+       \r
+       return ServiceDispatchImpl.ch.sessionKey;  // Return a global session key created in ServiceDispatchImpl\r
+       // This should be the same session key as is used in CryptoContentProvider.\r
+       // TODO: Clean up the code above?\r
     }\r
     \r
     /**\r