P4A-667 Remove own id, remove generated user_id, add pEp Version on decrypt.

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

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.

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

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;
     }

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)) {

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;