From d0e2df55db66c3a814c942fa1279a0a86d976cfc Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Fri, 27 Jul 2018 18:59:35 +0200
Subject: [PATCH] Update android test to build again

---
 android/build.gradle                                      | 2 +-
 androidTests/app/build.gradle                             | 8 ++++----
 .../app/src/main/java/com/pep/k9/MainActivity.java        | 2 +-
 .../app/src/main/java/com/pep/k9/PEpUnitaryStuff.java     | 2 +-
 .../app/src/main/java/com/pep/k9/UnitActivity.java        | 2 +-
 androidTests/build.gradle                                 | 4 +++-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 7378a48..6e57786 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -31,7 +31,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 18
diff --git a/androidTests/app/build.gradle b/androidTests/app/build.gradle
index 132085a..abfb76a 100644
--- a/androidTests/app/build.gradle
+++ b/androidTests/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 25
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
-        applicationId "pep.android.k9.materials"
+        applicationId "security.pEp"
         minSdkVersion 19
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
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 a7ed7f8..435a4f7 100644
--- a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
+++ b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
@@ -1429,7 +1429,7 @@ public class MainActivity extends AppCompatActivity {
     private Engine.decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException {
         long lastTime = System.currentTimeMillis();
         logStart("engine.decrypt_message", String.valueOf(lastTime));
-        Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage);
+        Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, 0);
         logEnd("engine.decrypt_message", String.valueOf(System.currentTimeMillis() - lastTime));
         return decrypt_message_return;
     }
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 3f024b6..3d8931f 100644
--- a/androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
+++ b/androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
@@ -37,7 +37,7 @@ public class PEpUnitaryStuff {
         msg.setCc(cc);
 
         Message encriptedMessage = engine.encrypt_message(msg, null, Message.EncFormat.PEP);
-        Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage);
+        Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, 0);
 
         if (!decrypt_message_return.dst.getLongmsg().equals(message)) {
             throw new RuntimeException("FAILED");
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 aae91cc..f8803c8 100644
--- a/androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
+++ b/androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
@@ -177,7 +177,7 @@ public class UnitActivity extends AppCompatActivity {
 
     private Engine.decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException {
         long lastTime = System.currentTimeMillis();
-        Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage);
+        Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, 0);
         long time = System.currentTimeMillis() - lastTime;
         Log.d("time", " " + time);
         return decrypt_message_return;
diff --git a/androidTests/build.gradle b/androidTests/build.gradle
index 2540ef4..8250249 100644
--- a/androidTests/build.gradle
+++ b/androidTests/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,5 +16,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }