From 0c9ce6cace0e5a7855dcebd3b1eca1bffec6da67 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Mon, 29 Oct 2018 12:09:01 +0100 Subject: [PATCH 1/5] Update engine version number and gradle buildtools version Android: v1.0.213 --- android/build.gradle | 2 +- android/src/org/pEp/jniadapter/AndroidHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 63e12a8..88a0e62 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 21 - buildToolsVersion '28.0.2' + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 18 diff --git a/android/src/org/pEp/jniadapter/AndroidHelper.java b/android/src/org/pEp/jniadapter/AndroidHelper.java index d5609f7..36b1256 100644 --- a/android/src/org/pEp/jniadapter/AndroidHelper.java +++ b/android/src/org/pEp/jniadapter/AndroidHelper.java @@ -29,7 +29,7 @@ public class AndroidHelper { private static File tmpDir; // TODO : Increment when needed. - public static int ENGINE_VERSION_CODE = 3063; + public static int ENGINE_VERSION_CODE = 3104; private static File shareDir; From 21ab55b3563cee8c3223023e2bdb7b0a184a959d Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Fri, 2 Nov 2018 12:05:25 +0100 Subject: [PATCH 2/5] Add -fPIC --- src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile b/src/Makefile index 2226b74..348c9dd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,6 +3,8 @@ SHARED=libpEpJNI.so JAR=jniadapter.jar include Makefile.conf +CXXFLAGS+=-std=c++14 -fPIC + all: $(JAR) $(SHARED) JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \ @@ -39,8 +41,10 @@ org_pEp_jniadapter_Message.h: org/pEp/jniadapter/Message.java javah $(subst /,.,$(subst .java,,$<)) org_pEp_jniadapter_AbstractEngine.o: %.o: %.cc %.h throw_pEp_exception.hh jniutils.hh + $(CXX) $(CXXFLAGS) -c $< -o $@ org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o: %.o: %.cc %.h + $(CXX) $(CXXFLAGS) -c $< -o $@ $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o throw_pEp_exception.o jniutils.o basic_api.o ar -r $@ *.o From 3187279c344d82bac0e553199e88f5331e662794 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Tue, 6 Nov 2018 13:30:42 +0100 Subject: [PATCH 3/5] Fix Testing.java - Build again --- test/Testing.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/Testing.java b/test/Testing.java index 09f95f7..0516528 100644 --- a/test/Testing.java +++ b/test/Testing.java @@ -42,35 +42,39 @@ class Testing { msg.setShortmsg("hello, world"); msg.setLongmsg("this is a test"); + msg.setDir(Message.Direction.Outgoing); Message enc = null; try { - enc = e.encrypt_message(msg, null); + enc = e.encrypt_message(msg, null, Message.EncFormat.PEP); System.out.println("encrypted"); } catch (pEpException ex) { System.out.println("cannot encrypt"); + ex.printStackTrace(); } + System.out.println(enc.getLongmsg()); Vector attachments = enc.getAttachments(); System.out.println(e.toUTF16(attachments.get(1).data)); msg.setDir(Message.Direction.Outgoing); try { - System.out.println(e.outgoing_message_color(msg)); + System.out.println(e.outgoing_message_rating(msg)); } catch (pEpException ex) { - System.out.println("cannot measure outgoing message color"); + System.out.println("cannot measure outgoing message rating"); } Engine.decrypt_message_Return result = null; try { - result = e.decrypt_message(enc); + result = e.decrypt_message(enc, new Vector<>(), 0); System.out.println("decrypted"); } catch (pEpException ex) { System.out.println("cannot decrypt"); + ex.printStackTrace(); } System.out.println(result.dst.getShortmsg()); From 4b7ea748ebb931d189cd82d03a437c558197501e Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Tue, 6 Nov 2018 13:51:15 +0100 Subject: [PATCH 4/5] Explicitily generate a new key and use it to encrypt. --- test/Testing.java | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/test/Testing.java b/test/Testing.java index 0516528..ccbf966 100644 --- a/test/Testing.java +++ b/test/Testing.java @@ -15,6 +15,18 @@ class Testing { } System.out.println("Test loaded"); + // Keygen + System.out.println("Generating keys: "); + Identity user = new Identity(); + user.user_id = "pEp_own_userId"; + user.me = true; + user.username = "Test User"; + user.address = "jniTestUser@peptest.ch"; + user = e.myself(user); + System.out.print("Keys generated: "); + System.out.println(user.fpr); + + // trustwords Identity vb = new Identity(); vb.fpr = "DB4713183660A12ABAFA7714EBE90D44146F62F4"; @@ -25,19 +37,14 @@ class Testing { // message Message msg = new Message(); - Identity from = new Identity(); - from.username = "Volker Birk"; - from.address = "vb@dingens.org"; - from.user_id = "23"; - from.me = true; - msg.setFrom(from); + msg.setFrom(user); Vector to = new Vector(); Identity to1 = new Identity(); - to1.username = "Volker Birk"; - to1.address = "vb@pep-project.org"; - to1.user_id = "42"; - to.add(to1); + //to1.username = "Volker Birk"; + //to1.address = "vb@pep-project.org"; + //to1.user_id = "42"; + to.add(user); msg.setTo(to); msg.setShortmsg("hello, world"); From d73122d1a537f5976d7dc61f8ccb17e95b859163 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Wed, 7 Nov 2018 11:53:24 +0100 Subject: [PATCH 5/5] Make Message.java Serializable SerializableUID generated by Intellij --- src/gen_java_Message.ysl2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gen_java_Message.ysl2 b/src/gen_java_Message.ysl2 index 34d235c..10da80a 100644 --- a/src/gen_java_Message.ysl2 +++ b/src/gen_java_Message.ysl2 @@ -16,8 +16,10 @@ tstylesheet { import java.util.Vector; import java.util.Date; import java.util.HashMap; + import java.io.Serializable; - public class «$cname» implements AutoCloseable { + public class «$cname» implements AutoCloseable, Serializable { + private static final long serialVersionUID = 2119420428331150924L; private long handle; native long init();