Browse Source

Update android test to build again

JNI-76
Hussein Kasem 7 years ago
parent
commit
d0e2df55db
  1. 2
      android/build.gradle
  2. 8
      androidTests/app/build.gradle
  3. 2
      androidTests/app/src/main/java/com/pep/k9/MainActivity.java
  4. 2
      androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
  5. 2
      androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
  6. 4
      androidTests/build.gradle

2
android/build.gradle

@ -31,7 +31,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion '26.0.2' buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
minSdkVersion 18 minSdkVersion 18

8
androidTests/app/build.gradle

@ -1,13 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 23 compileSdkVersion 25
buildToolsVersion '25.0.2' buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
applicationId "pep.android.k9.materials" applicationId "security.pEp"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 23 targetSdkVersion 25
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }

2
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 { private Engine.decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException {
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
logStart("engine.decrypt_message", String.valueOf(lastTime)); 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)); logEnd("engine.decrypt_message", String.valueOf(System.currentTimeMillis() - lastTime));
return decrypt_message_return; return decrypt_message_return;
} }

2
androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java

@ -37,7 +37,7 @@ public class PEpUnitaryStuff {
msg.setCc(cc); msg.setCc(cc);
Message encriptedMessage = engine.encrypt_message(msg, null, Message.EncFormat.PEP); 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)) { if (!decrypt_message_return.dst.getLongmsg().equals(message)) {
throw new RuntimeException("FAILED"); throw new RuntimeException("FAILED");

2
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 { private Engine.decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException {
long lastTime = System.currentTimeMillis(); 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; long time = System.currentTimeMillis() - lastTime;
Log.d("time", " " + time); Log.d("time", " " + time);
return decrypt_message_return; return decrypt_message_return;

4
androidTests/build.gradle

@ -3,9 +3,10 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -15,5 +16,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
} }
} }

Loading…
Cancel
Save