From d20e7cdba57db05146c007bed4b01632056a47be Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Fri, 2 Mar 2018 20:19:18 +0100
Subject: [PATCH] P4A-667 Remove own id, remove generated user_id, add pEp
 Version on decrypt.

---
 android/jni/Android.mk                                         | 2 +-
 android/src/org/pEp/jniadapter/AndroidHelper.java              | 3 ++-
 androidTests/app/build.gradle                                  | 2 +-
 androidTests/app/src/main/java/com/pep/k9/MainActivity.java    | 2 +-
 androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java | 2 +-
 androidTests/app/src/main/java/com/pep/k9/UnitActivity.java    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index ca6c2db..4c6da64 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 ENGINE_PATH := $(LOCAL_PATH)/../../../pEpEngine
-GPGBUILD:= $(LOCAL_PATH)/../external/data/data/pep.android.k9/app_opt
+GPGBUILD:= $(LOCAL_PATH)/../external/data/data/pep.android.k9.materials/app_opt
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libassuan
diff --git a/android/src/org/pEp/jniadapter/AndroidHelper.java b/android/src/org/pEp/jniadapter/AndroidHelper.java
index 438277b..3498029 100644
--- a/android/src/org/pEp/jniadapter/AndroidHelper.java
+++ b/android/src/org/pEp/jniadapter/AndroidHelper.java
@@ -221,7 +221,8 @@ public class AndroidHelper {
     }
 
     public static boolean needNewAssets() {
-        return ENGINE_VERSION_CODE != getInstalledVersion();
+        return true;
+        //return ENGINE_VERSION_CODE != getInstalledVersion();
     }
 
     // TODO: replace with native impl, less prone to failure.
diff --git a/androidTests/app/build.gradle b/androidTests/app/build.gradle
index e9abca3..132085a 100644
--- a/androidTests/app/build.gradle
+++ b/androidTests/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion '25.0.2'
 
     defaultConfig {
-        applicationId "pep.android.k9"
+        applicationId "pep.android.k9.materials"
         minSdkVersion 19
         targetSdkVersion 23
         versionCode 1
diff --git a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
index f6fc094..a7ed7f8 100644
--- a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
+++ b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
@@ -1437,7 +1437,7 @@ public class MainActivity extends AppCompatActivity {
     private Message encryptMessageOnEngine(Engine engine, Message msg) throws pEpException {
         long lastTime = System.currentTimeMillis();
         logStart("engine.encrypt_message", String.valueOf(lastTime));
-        Message message = engine.encrypt_message(msg, null);
+        Message message = engine.encrypt_message(msg, null, Message.EncFormat.PEP);
         logEnd("engine.encrypt_message", String.valueOf(System.currentTimeMillis() - lastTime));
         return message;
     }
diff --git a/androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java b/androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
index 53e1ad5..3f024b6 100644
--- a/androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
+++ b/androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
@@ -36,7 +36,7 @@ public class PEpUnitaryStuff {
         cc.add(new Identity());
         msg.setCc(cc);
 
-        Message encriptedMessage = engine.encrypt_message(msg, null);
+        Message encriptedMessage = engine.encrypt_message(msg, null, Message.EncFormat.PEP);
         Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage);
 
         if (!decrypt_message_return.dst.getLongmsg().equals(message)) {
diff --git a/androidTests/app/src/main/java/com/pep/k9/UnitActivity.java b/androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
index 8e54bdf..aae91cc 100644
--- a/androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
+++ b/androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
@@ -185,7 +185,7 @@ public class UnitActivity extends AppCompatActivity {
 
     private Message encryptMessageOnEngine(Engine engine, Message msg) throws pEpException {
         long lastTime = System.currentTimeMillis();
-        Message message = engine.encrypt_message(msg, null);
+        Message message = engine.encrypt_message(msg, null, Message.EncFormat.PEP);
         long time = System.currentTimeMillis() - lastTime;
         Log.d("time", " " + time);
         return message;