Browse Source

Revert "Finally compiled through, now we've gotta test it"

This reverts commit 2237fa3a1c.
pull/13/head
David Lanzendörfer 3 years ago
parent
commit
3206a0f952
  1. 7
      src/codegen/pEp.yml2
  2. 8
      src/cxx/jniutils.cc
  3. 3
      src/cxx/jniutils.hh
  4. 6
      src/java/foundation/pEp/jniadapter/decrypt_message_Return.java

7
src/codegen/pEp.yml2

@ -114,10 +114,11 @@ namespace pEp {
); );
method cached=true decrypt_message( method cached=true decrypt_message(
in message src, inout message src,
creates message dst, creates message dst,
creates stringlist keylist, inout stringlist keylist,
in DecryptFlags flags returns Rating rating,
inout int flags
); );
method cached=true re_evaluate_message_rating( method cached=true re_evaluate_message_rating(

8
src/cxx/jniutils.cc

@ -233,14 +233,6 @@ int to_Integer(JNIEnv *env,
return _val; return _val;
} }
PEP_decrypt_flags_t *to_DecryptFlags(JNIEnv *env,
jobject flags)
{
PEP_decrypt_flags_t *_val;
(*_val) = (PEP_decrypt_flags_t)1;
return _val;
}
jbyteArray from_string(JNIEnv *env, jbyteArray from_string(JNIEnv *env,
const char *str) const char *str)
{ {

3
src/cxx/jniutils.hh

@ -85,9 +85,6 @@ jobject from_Integer(JNIEnv *env,
int to_Integer(JNIEnv *env, int to_Integer(JNIEnv *env,
jobject obj); jobject obj);
PEP_decrypt_flags_t *to_DecryptFlags(JNIEnv *env,
jobject flags);
jbyteArray from_string(JNIEnv *env, jbyteArray from_string(JNIEnv *env,
const char *str); const char *str);

6
src/java/foundation/pEp/jniadapter/decrypt_message_Return.java

@ -1,9 +1,7 @@
package foundation.pEp.jniadapter; package foundation.pEp.jniadapter;
import java.util.Vector;
public class decrypt_message_Return { public class decrypt_message_Return {
public Message dst; public Message dst;
public Vector<String> keylist; public Rating rating;
public DecryptFlags flags; public int flags;
} }

Loading…
Cancel
Save