Browse Source

Update JNI-13 compromized to mistrusted, fix blacklist_delete and update Engine Version

JNI-44
Hussein Kasem 9 years ago
parent
commit
fdeca65736
  1. 2
      android/src/org/pEp/jniadapter/AndroidHelper.java
  2. 6
      src/basic_api.cc
  3. 2
      src/pEp.yml2

2
android/src/org/pEp/jniadapter/AndroidHelper.java

@ -29,7 +29,7 @@ public class AndroidHelper {
private static File tmpDir; private static File tmpDir;
// TODO : Increment when needed. // TODO : Increment when needed.
public static int ENGINE_VERSION_CODE = 1122; public static int ENGINE_VERSION_CODE = 1220;
private static File shareDir; private static File shareDir;

6
src/basic_api.cc

@ -74,7 +74,7 @@ JNIEXPORT jobject JNICALL Java_org_pEp_jniadapter_Engine_updateIdentity(
return from_identity(env, _ident); return from_identity(env, _ident);
} }
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_keyCompromized( JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_keyMistrusted(
JNIEnv *env, JNIEnv *env,
jobject obj, jobject obj,
jobject ident jobject ident
@ -95,7 +95,7 @@ JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_keyCompromized(
return; return;
} }
::key_compromized(session, _ident); ::key_mistrusted(session, _ident);
} }
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_keyResetTrust( JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_keyResetTrust(
@ -228,7 +228,7 @@ JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_blacklist_1delete(
return; return;
} }
PEP_STATUS status = ::blacklist_add(session, _fpr); PEP_STATUS status = ::blacklist_delete(session, _fpr);
if (status != PEP_STATUS_OK) { if (status != PEP_STATUS_OK) {
throw_pEp_Exception(env, status); throw_pEp_Exception(env, status);
return; return;

2
src/pEp.yml2

@ -172,7 +172,7 @@ namespace pEp {
basic string trustwords(identity ident); basic string trustwords(identity ident);
basic identity myself(identity ident); basic identity myself(identity ident);
basic identity updateIdentity(identity ident); basic identity updateIdentity(identity ident);
basic void keyCompromized(identity ident); basic void keyMistrusted(identity ident);
basic void keyResetTrust(identity ident); basic void keyResetTrust(identity ident);
basic void trustPersonalKey(identity ident); basic void trustPersonalKey(identity ident);
basic void importKey(string key); basic void importKey(string key);

Loading…
Cancel
Save