From 5889fe12172a36e1176bc2ec8ba167bd60898628 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Thu, 9 Jun 2016 16:57:39 +0200
Subject: [PATCH] Added DecryptFlags, ignored new import_key private keys
 identity list

---
 androidTests/build.gradle | 2 +-
 src/basic_api.cc          | 2 +-
 src/gen_cpp_Engine.ysl2   | 4 ++--
 src/pEp.yml2              | 9 +++++++--
 src/types_c.ysl2          | 2 ++
 src/types_java.ysl2       | 2 ++
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/androidTests/build.gradle b/androidTests/build.gradle
index 1b7886d..e220f0b 100644
--- a/androidTests/build.gradle
+++ b/androidTests/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/src/basic_api.cc b/src/basic_api.cc
index 72a140a..7927a8f 100644
--- a/src/basic_api.cc
+++ b/src/basic_api.cc
@@ -160,7 +160,7 @@ JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_importKey(
     }
 
     
-    PEP_STATUS status = ::import_key(session, _key, strlen(_key));
+    PEP_STATUS status = ::import_key(session, _key, strlen(_key), NULL);
     if (status != PEP_STATUS_OK) {
         throw_pEp_Exception(env, status);
         return;
diff --git a/src/gen_cpp_Engine.ysl2 b/src/gen_cpp_Engine.ysl2
index ff5f45c..a54c818 100644
--- a/src/gen_cpp_Engine.ysl2
+++ b/src/gen_cpp_Engine.ysl2
@@ -222,8 +222,8 @@ tstylesheet {
         const "name", "name(*[3])";
 
         choose {
-            when "$type = 'Color'"
-                | PEP_color _«$name»;
+            when "ancestor::namespace/child::enum[@name=$type]"
+                | √$type _«$name»;
             otherwise
                 | √$type *_«$name»;
         }
diff --git a/src/pEp.yml2 b/src/pEp.yml2
index ed0f4c5..76bce79 100644
--- a/src/pEp.yml2
+++ b/src/pEp.yml2
@@ -56,7 +56,7 @@ namespace pEp {
         pEp_unknown_error								> -1
     };
 
-    enum color {
+    enum Color {
         pEp_rating_undefined > 0
         pEp_rating_cannot_decrypt > 1
         pEp_rating_have_no_key > 2
@@ -76,6 +76,10 @@ namespace pEp {
         pEp_rating_under_attack > -3
     };
 
+    enum DecryptFlags {
+        pEp_decrypt_flag_own_private_key > 1
+    };
+
     interface Engine {
         method encrypt_message(
                 in message src,
@@ -87,7 +91,8 @@ namespace pEp {
                 in message src,
                 creates message dst,
                 creates stringlist keylist,
-                returns Color color
+                returns Color color,
+                returns DecryptFlags flags
             );
 
         method outgoing_message_color(
diff --git a/src/types_c.ysl2 b/src/types_c.ysl2
index 3000339..24aa23e 100644
--- a/src/types_c.ysl2
+++ b/src/types_c.ysl2
@@ -12,6 +12,8 @@ function "toC" {
         when "$type='stringpairlist'" > stringpair_list_t
         when "$type='direction'" > PEP_msg_direction
         when "$type='bool'" > bool
+        when "$type='DecryptFlags'" > PEP_decrypt_flags_t
+        when "$type='Color'" > PEP_color
 
         otherwise value "$type";
     }
diff --git a/src/types_java.ysl2 b/src/types_java.ysl2
index ade2075..9dc0de7 100644
--- a/src/types_java.ysl2
+++ b/src/types_java.ysl2
@@ -60,6 +60,7 @@ function "toSig" {
                 when "$type='stringpairlist'" > java/util/ArrayList
                 when "$type='message'" > org/pEp/jniadapter/Message
                 when "$type='Color'" > org/pEp/jniadapter/Color
+                when "$type='DecryptFlags'" > org/pEp/jniadapter/DecryptFlags
             }
             > ;
         }
@@ -77,6 +78,7 @@ function "toIntermediate" {
         when "$type='identitylist'" > Vector<_Identity>
         when "$type='bloblist'" > Vector<_Blob>
         when "$type='bool'" > boolean
+        when "$type='DecryptFlags'" > DecryptFlags
 
         otherwise call "toJava" with "type", "$type";
     }