timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Local variable renaming

Browse source
This commit is contained in:
pedroGitt 2016-10-20 17:40:20 +02:00
parent 50bf60499a
commit 8b050e5e1e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp
View file

@ -571,7 +571,7 @@ JNIEXPORT jint OLM_SESSION_FUNC_DEF(encryptMessageJni)(JNIEnv *env, jobject thiz
JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessageJni)(JNIEnv *env, jobject thiz, jobject aEncryptedMsg) JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessageJni)(JNIEnv *env, jobject thiz, jobject aEncryptedMsg)
{ {
jstring decryptedMsgRetValue = 0; jstring decryptedMsgRetValue = 0;
jclass encryptedMsgJclass = 0; jclass encryptedMsgJClass = 0;
jstring encryptedMsgJstring = 0; // <= obtained from encryptedMsgFieldId jstring encryptedMsgJstring = 0; // <= obtained from encryptedMsgFieldId
// field IDs // field IDs
jfieldID encryptedMsgFieldId; jfieldID encryptedMsgFieldId;
@ -592,15 +592,15 @@ JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessageJni)(JNIEnv *env, jobject t
{ {
LOGE("## decryptMessageJni(): failure - invalid encrypted message"); LOGE("## decryptMessageJni(): failure - invalid encrypted message");
} }
else if(0 == (encryptedMsgJclass = env->GetObjectClass(aEncryptedMsg))) else if(0 == (encryptedMsgJClass = env->GetObjectClass(aEncryptedMsg)))
{ {
LOGE("## decryptMessageJni(): failure - unable to get encrypted message class"); LOGE("## decryptMessageJni(): failure - unable to get encrypted message class");
} }
else if(0 == (encryptedMsgFieldId = env->GetFieldID(encryptedMsgJclass,"mCipherText","Ljava/lang/String;"))) else if(0 == (encryptedMsgFieldId = env->GetFieldID(encryptedMsgJClass,"mCipherText","Ljava/lang/String;")))
{ {
LOGE("## decryptMessageJni(): failure - unable to get message field"); LOGE("## decryptMessageJni(): failure - unable to get message field");
} }
else if(0 == (typeMsgFieldId = env->GetFieldID(encryptedMsgJclass,"mType","J"))) else if(0 == (typeMsgFieldId = env->GetFieldID(encryptedMsgJClass,"mType","J")))
{ {
LOGE("## decryptMessageJni(): failure - unable to get message type field"); LOGE("## decryptMessageJni(): failure - unable to get message type field");
} }