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

diff --git a/.classpath b/.classpath
index ef7c361cff193e3ccc3d975b1782fa396ea27af8..86a15c90b0c7ed8b5fae1cb04b6a4f574db0e7f0 100644 (file)
--- 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"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>\r
+       <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="src" path="gen"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r

diff --git a/default.properties b/default.properties
new file mode 100644 (file)
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 da253e0c8833017b67a8aa0ff94c11ef3e37e10e..5f033dccc3c1cc575f9560704ad226a7c99b3d48 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -201,8 +201,7 @@ Current version: %s
     <!-- File Manager -->\r
     <string name="filemanager_not_available">No compatible file manager is available.</string>\r
     <string name="filemanager_get_oi_filemanager">Get OI File Manager</string>\r
-\r
-       \r
+    \r
        <!-- ***************************\r
             Permissions\r
             *************************** -->\r

diff --git a/src/org/openintents/intents/CryptoIntents.java b/src/org/openintents/intents/CryptoIntents.java
index 7ef5bb7a2eeddd10418982b2b8a5a4a098633263..a55cd7ee0791a9f04686a1df7dcb77746dd31423 100644 (file)
--- 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>\r
         */\r
        public static final String EXTRA_PROMPT = "org.openintents.extra.PROMPT";\r
+       \r
+       /**\r
+        * Set if the activity handles encrypted content.\r
+        * \r
+        * <p>Constant Value: "org.openintents.category.SAFE"</p>\r
+        */\r
+       public static final String CATEGORY_SAFE = "org.openintents.category.SAFE";\r
 }\r

diff --git a/src/org/openintents/safe/IntentHandler.java b/src/org/openintents/safe/IntentHandler.java
index 9e559c3c7efdf40deda6504bb5ea488a3e45ae7a..7911cf0fbfdceed54093f765238b00a6c7cc896d 100644 (file)
--- 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);\r
                        }\r
 \r
+                       if (thisIntent.hasExtra(CryptoIntents.EXTRA_SESSION_KEY)) {\r
+                               String sessionkey = ch.getCurrentSessionKey();\r
+                               callbackIntent.putExtra(CryptoIntents.EXTRA_SESSION_KEY, sessionkey);\r
+                       }\r
+                       \r
                        if (thisIntent.getData() != null) {\r
                                // Decrypt file from file URI\r
                                Uri fileUri = thisIntent.getData();\r