Browse Source

Make import_key return identity list instead of void

JNI-96
heck 5 years ago
parent
commit
195e240a2e
  1. 17
      src/basic_api.cc
  2. 2
      src/pEp.yml2

17
src/basic_api.cc

@ -252,7 +252,7 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_Engine__1trustOwnKey(
::trust_own_key(session(), _ident); ::trust_own_key(session(), _ident);
} }
JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_Engine_importKey( JNIEXPORT jobject JNICALL Java_foundation_pEp_jniadapter_Engine_importKey(
JNIEnv *env, JNIEnv *env,
jobject obj, jobject obj,
jbyteArray key jbyteArray key
@ -271,18 +271,27 @@ JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_Engine_importKey(
if(_key == NULL){ if(_key == NULL){
throw_pEp_Exception(env, PEP_OUT_OF_MEMORY); throw_pEp_Exception(env, PEP_OUT_OF_MEMORY);
return; return NULL;
} }
PEP_STATUS status = ::import_key(session(), _key, _size, NULL); identity_list *_identities;
PEP_STATUS status = ::import_key(session(), _key, _size, &_identities);
if (status != PEP_STATUS_OK && status != PEP_KEY_IMPORTED) { if (status != PEP_STATUS_OK && status != PEP_KEY_IMPORTED) {
throw_pEp_Exception(env, status); throw_pEp_Exception(env, status);
return; return NULL;
}
jobject identities_ = NULL;
if (_identities) {
identities_ = from_identitylist(env, _identities);
} }
env->ReleaseByteArrayElements(key, (jbyte *) _key, JNI_ABORT); env->ReleaseByteArrayElements(key, (jbyte *) _key, JNI_ABORT);
return identities_;
} }
JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_Engine__1config_1passive_1mode( JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_Engine__1config_1passive_1mode(
JNIEnv *env, JNIEnv *env,
jobject obj, jobject obj,

2
src/pEp.yml2

@ -267,7 +267,7 @@ namespace pEp {
basic void keyResetTrust(identity ident); basic void keyResetTrust(identity ident);
basic void trustPersonalKey(identity ident); basic void trustPersonalKey(identity ident);
basic void trustOwnKey(identity ident); basic void trustOwnKey(identity ident);
basic void importKey(bytearray key); basic identitylist importKey(bytearray key);
basic void blacklist_add(string fpr); basic void blacklist_add(string fpr);
basic void blacklist_delete(string fpr); basic void blacklist_delete(string fpr);
basic bool blacklist_is_listed(string fpr); basic bool blacklist_is_listed(string fpr);

Loading…
Cancel
Save