Browse Source

Update android test to build again

readd-ident.id
Hussein Kasem 4 years ago
parent
commit
d0e2df55db
6 changed files with 11 additions and 9 deletions
  1. +1
    -1
      android/build.gradle
  2. +4
    -4
      androidTests/app/build.gradle
  3. +1
    -1
      androidTests/app/src/main/java/com/pep/k9/MainActivity.java
  4. +1
    -1
      androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
  5. +1
    -1
      androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
  6. +3
    -1
      androidTests/build.gradle

+ 1
- 1
android/build.gradle View File

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


+ 4
- 4
androidTests/app/build.gradle View File

@ -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"
}


+ 1
- 1
androidTests/app/src/main/java/com/pep/k9/MainActivity.java View File

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


+ 1
- 1
androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java View File

@ -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");


+ 1
- 1
androidTests/app/src/main/java/com/pep/k9/UnitActivity.java View File

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


+ 3
- 1
androidTests/build.gradle View File

@ -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()
}
}

Loading…
Cancel
Save