From 444996af6fb54ff2453551dc82f5f3dc9bed31ed Mon Sep 17 00:00:00 2001
From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Wed, 29 Apr 2009 23:50:11 +0000
Subject: [PATCH] OI Safe: Add category for activities, and return session key
 also in decrypt intent.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2058 72b678ce-9140-0410-bee8-679b907dd61a
---
 .classpath                                     | 13 +++++++------
 default.properties                             | 11 +++++++++++
 res/values/strings.xml                         |  3 +--
 src/org/openintents/intents/CryptoIntents.java |  7 +++++++
 src/org/openintents/safe/IntentHandler.java    |  5 +++++
 5 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 default.properties

diff --git a/.classpath b/.classpath
index ef7c361..86a15c9 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/default.properties b/default.properties
new file mode 100644
index 0000000..eba5c59
--- /dev/null
+++ b/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-2
diff --git a/res/values/strings.xml b/res/values/strings.xml
index da253e0..5f033dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -201,8 +201,7 @@ Current version: %s
     <!-- File Manager -->
     <string name="filemanager_not_available">No compatible file manager is available.</string>
     <string name="filemanager_get_oi_filemanager">Get OI File Manager</string>
-
-	
+    
 	<!-- ***************************
 	     Permissions
 	     *************************** -->
diff --git a/src/org/openintents/intents/CryptoIntents.java b/src/org/openintents/intents/CryptoIntents.java
index 7ef5bb7..a55cd7e 100644
--- a/src/org/openintents/intents/CryptoIntents.java
+++ b/src/org/openintents/intents/CryptoIntents.java
@@ -157,4 +157,11 @@ public class CryptoIntents {
 	 * <p>Constant Value: "org.openintents.extra.PROMPT"</p>
 	 */
 	public static final String EXTRA_PROMPT = "org.openintents.extra.PROMPT";
+	
+	/**
+	 * Set if the activity handles encrypted content.
+	 * 
+	 * <p>Constant Value: "org.openintents.category.SAFE"</p>
+	 */
+	public static final String CATEGORY_SAFE = "org.openintents.category.SAFE";
 }
diff --git a/src/org/openintents/safe/IntentHandler.java b/src/org/openintents/safe/IntentHandler.java
index 9e559c3..7911cf0 100644
--- a/src/org/openintents/safe/IntentHandler.java
+++ b/src/org/openintents/safe/IntentHandler.java
@@ -324,6 +324,11 @@ public class IntentHandler extends Activity {
 				callbackIntent.putExtra(CryptoIntents.EXTRA_TEXT_ARRAY, out);
 			}
 
+			if (thisIntent.hasExtra(CryptoIntents.EXTRA_SESSION_KEY)) {
+				String sessionkey = ch.getCurrentSessionKey();
+				callbackIntent.putExtra(CryptoIntents.EXTRA_SESSION_KEY, sessionkey);
+			}
+			
 			if (thisIntent.getData() != null) {
 				// Decrypt file from file URI
 				Uri fileUri = thisIntent.getData();
-- 
2.50.1