olm_account.cpp 22.1 KB
Newer Older
1
2
/*
 * Copyright 2016 OpenMarket Ltd
ylecollen's avatar
ylecollen committed
3
 * Copyright 2016 Vector Creations Ltd
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#include "olm_account.h"

pedroGitt's avatar
pedroGitt committed
20
21
using namespace AndroidOlmSdk;

22

23
24
/**
* Init memory allocation for account creation.
25
* @return valid memory allocation, NULL otherwise
26
27
28
29
30
31
32
33
34
**/
OlmAccount* initializeAccountMemory()
{
    OlmAccount* accountPtr = NULL;
    size_t accountSize = olm_account_size();

    if(NULL != (accountPtr=(OlmAccount*)malloc(accountSize)))
    { // init account object
      accountPtr = olm_account(accountPtr);
pedroGitt's avatar
pedroGitt committed
35
      LOGD("## initializeAccountMemory(): success - OLM account size=%lu",static_cast<long unsigned int>(accountSize));
36
37
38
39
40
41
42
43
44
    }
    else
    {
      LOGE("## initializeAccountMemory(): failure - OOM");
    }

    return accountPtr;
}

45
46
47
48
49
50
51
52
53
54
55

JNIEXPORT jlong OLM_ACCOUNT_FUNC_DEF(createNewAccountJni)(JNIEnv *env, jobject thiz)
{
    LOGD("## createNewAccountJni(): IN");
    OlmAccount* accountPtr = initializeAccountMemory();

    LOGD(" ## createNewAccountJni(): success - accountPtr=%p (jlong)(intptr_t)accountPtr=%lld",accountPtr,(jlong)(intptr_t)accountPtr);
    return (jlong)(intptr_t)accountPtr;
}


56
57
58
59
60
/**
 * Release the account allocation made by initializeAccountMemory().<br>
 * This method MUST be called when java counter part account instance is done.
 *
 */
pedroGitt's avatar
pedroGitt committed
61
JNIEXPORT void OLM_ACCOUNT_FUNC_DEF(releaseAccountJni)(JNIEnv *env, jobject thiz)
62
63
64
{
  OlmAccount* accountPtr = NULL;

65
  LOGD("## releaseAccountJni(): IN");
66
67
68

  if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
  {
69
      LOGE(" ## releaseAccountJni(): failure - invalid Account ptr=NULL");
70
71
  }
  else
pedroGitt's avatar
pedroGitt committed
72
  {
73
    LOGD(" ## releaseAccountJni(): accountPtr=%p",accountPtr);
pedroGitt's avatar
pedroGitt committed
74
75
    olm_clear_account(accountPtr);

76
    LOGD(" ## releaseAccountJni(): IN");
pedroGitt's avatar
pedroGitt committed
77
    // even if free(NULL) does not crash, logs are performed for debug purpose
78
    free(accountPtr);
79
    LOGD(" ## releaseAccountJni(): OUT");
80
81
82
83
84
85
  }
}

/**
* Initialize a new account and return it to JAVA side.<br>
* Since a C prt is returned as a jlong, special care will be taken
86
* to make the cast (OlmAccount* => jlong) platform independent.
87
88
* @return the initialized OlmAccount* instance if init succeed, NULL otherwise
**/
pedroGitt's avatar
pedroGitt committed
89
JNIEXPORT jlong OLM_ACCOUNT_FUNC_DEF(initNewAccountJni)(JNIEnv *env, jobject thiz)
90
{
pedroGitt's avatar
pedroGitt committed
91
92
    OlmAccount *accountPtr = NULL;
    uint8_t *randomBuffPtr = NULL;
93
    size_t accountRetCode;
pedroGitt's avatar
pedroGitt committed
94
    size_t randomSize;
95
96
97
98
99
100
101
102

    // init account memory allocation
    if(NULL == (accountPtr = initializeAccountMemory()))
    {
        LOGE("## initNewAccount(): failure - init account OOM");
    }
    else
    {
103
        // get random buffer size
104
        randomSize = olm_create_account_random_length(accountPtr);
pedroGitt's avatar
pedroGitt committed
105
        LOGD("## initNewAccount(): randomSize=%lu", static_cast<long unsigned int>(randomSize));
106
107

        // allocate random buffer
108
        if((0!=randomSize) && !setRandomInBuffer(env, &randomBuffPtr, randomSize))
109
        {
pedroGitt's avatar
pedroGitt committed
110
            LOGE("## initNewAccount(): failure - random buffer init");
111
112
        }
        else
pedroGitt's avatar
pedroGitt committed
113
        {
114
            // create account
pedroGitt's avatar
pedroGitt committed
115
            accountRetCode = olm_create_account(accountPtr, (void*)randomBuffPtr, randomSize);
116
            if(accountRetCode == olm_error()) {
ylecollen's avatar
ylecollen committed
117
                LOGE("## initNewAccount(): failure - account creation failed Msg=%s", olm_account_last_error(accountPtr));
118
119
120
121
122
123
124
             }

            LOGD("## initNewAccount(): success - OLM account created");
            LOGD("## initNewAccount(): success - accountPtr=%p (jlong)(intptr_t)accountPtr=%lld",accountPtr,(jlong)(intptr_t)accountPtr);
        }
    }

pedroGitt's avatar
pedroGitt committed
125
126
127
128
129
    if(NULL != randomBuffPtr)
    {
        free(randomBuffPtr);
    }

130
131
132
    return (jlong)(intptr_t)accountPtr;
}

pedroGitt's avatar
pedroGitt committed
133
134


135
136
137
138
139
140
141
142
// *********************************************************************
// ************************* IDENTITY KEYS API *************************
// *********************************************************************
/**
* Get identity keys: Ed25519 fingerprint key and Curve25519 identity key.<br>
* The keys are returned in the byte array.
* @return a valid byte array if operation succeed, null otherwise
**/
pedroGitt's avatar
pedroGitt committed
143
JNIEXPORT jbyteArray OLM_ACCOUNT_FUNC_DEF(identityKeysJni)(JNIEnv *env, jobject thiz)
144
145
146
147
148
149
150
151
152
153
154
155
{
    OlmAccount* accountPtr = NULL;
    size_t identityKeysLength;
    uint8_t *identityKeysBytesPtr;
    size_t keysResult;
    jbyteArray byteArrayRetValue = NULL;

    if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
        LOGE("## identityKeys(): failure - invalid Account ptr=NULL");
    }
    else
ylecollen's avatar
ylecollen committed
156
157
158
    {
        LOGD("## identityKeys(): accountPtr =%p", accountPtr);
        // identity keys allocation
159
        identityKeysLength = olm_account_identity_keys_length(accountPtr);
ylecollen's avatar
ylecollen committed
160
        if(NULL == (identityKeysBytesPtr=(uint8_t*)malloc(identityKeysLength)))
161
162
163
164
165
166
167
        {
            LOGE("## identityKeys(): failure - identity keys array OOM");
        }
        else
        {   // retrieve key pairs in identityKeysBytesPtr
            keysResult = olm_account_identity_keys(accountPtr, identityKeysBytesPtr, identityKeysLength);
            if(keysResult == olm_error()) {
168
                LOGE("## identityKeys(): failure - error getting identity keys Msg=%s",(const char *)olm_account_last_error(accountPtr));
169
170
171
172
173
174
175
176
177
178
            }
            else
            {   // allocate the byte array to be returned to java
                if(NULL == (byteArrayRetValue=env->NewByteArray(identityKeysLength)))
                {
                    LOGE("## identityKeys(): failure - return byte array OOM");
                }
                else
                {
                    env->SetByteArrayRegion(byteArrayRetValue, 0/*offset*/, identityKeysLength, (const jbyte*)identityKeysBytesPtr);
pedroGitt's avatar
pedroGitt committed
179
                    LOGD("## identityKeys(): success - result=%lu", static_cast<long unsigned int>(keysResult));
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
                }
            }

            free(identityKeysBytesPtr);
        }
    }

    return byteArrayRetValue;
}

// *********************************************************************
// ************************* ONE TIME KEYS API *************************
// *********************************************************************
/**
 * Get the maximum number of "one time keys" the account can store.
 *
**/
pedroGitt's avatar
pedroGitt committed
197
JNIEXPORT jlong OLM_ACCOUNT_FUNC_DEF(maxOneTimeKeysJni)(JNIEnv *env, jobject thiz)
198
199
200
201
202
203
204
205
206
207
208
209
{
    OlmAccount* accountPtr = NULL;
    size_t maxKeys = -1;

    if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
        LOGE("## maxOneTimeKey(): failure - invalid Account ptr=NULL");
    }
    else
    {
        maxKeys = olm_account_max_number_of_one_time_keys(accountPtr);
    }
pedroGitt's avatar
pedroGitt committed
210
    LOGD("## maxOneTimeKey(): Max keys=%lu", static_cast<long unsigned int>(maxKeys));
211
212
213
214
215
216
217
218
219

    return (jlong)maxKeys;
}

/**
 * Generate "one time keys".
 * @param aNumberOfKeys number of keys to generate
 * @return ERROR_CODE_OK if operation succeed, ERROR_CODE_KO otherwise
**/
pedroGitt's avatar
pedroGitt committed
220
JNIEXPORT jint OLM_ACCOUNT_FUNC_DEF(generateOneTimeKeysJni)(JNIEnv *env, jobject thiz, jint aNumberOfKeys)
221
{
pedroGitt's avatar
pedroGitt committed
222
223
    OlmAccount *accountPtr = NULL;
    uint8_t *randomBufferPtr = NULL;
224
    jint retCode = ERROR_CODE_KO;
pedroGitt's avatar
pedroGitt committed
225
    size_t randomLength;
226
227
228
229
230
    size_t result;


    if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
pedroGitt's avatar
pedroGitt committed
231
        LOGE("## generateOneTimeKeysJni(): failure - invalid Account ptr");
232
233
234
    }
    else
    {   // keys memory allocation
235
        randomLength = olm_account_generate_one_time_keys_random_length(accountPtr, (size_t)aNumberOfKeys);
pedroGitt's avatar
pedroGitt committed
236
        LOGD("## generateOneTimeKeysJni(): randomLength=%lu", static_cast<long unsigned int>(randomLength));
pedroGitt's avatar
pedroGitt committed
237

238
        if((0!=randomLength) && !setRandomInBuffer(env, &randomBufferPtr, randomLength))
239
        {
pedroGitt's avatar
pedroGitt committed
240
            LOGE("## generateOneTimeKeysJni(): failure - random buffer init");
241
242
        }
        else
pedroGitt's avatar
pedroGitt committed
243
        {
pedroGitt's avatar
pedroGitt committed
244
            LOGD("## generateOneTimeKeysJni(): accountPtr =%p aNumberOfKeys=%d",accountPtr, aNumberOfKeys);
pedroGitt's avatar
pedroGitt committed
245
246

            // retrieve key pairs in keysBytesPtr
247
            result = olm_account_generate_one_time_keys(accountPtr, (size_t)aNumberOfKeys, (void*)randomBufferPtr, randomLength);
248
            if(result == olm_error()) {
pedroGitt's avatar
pedroGitt committed
249
                LOGE("## generateOneTimeKeysJni(): failure - error generating one time keys Msg=%s",(const char *)olm_account_last_error(accountPtr));
250
251
252
253
            }
            else
            {
                retCode = ERROR_CODE_OK;
pedroGitt's avatar
pedroGitt committed
254
                LOGD("## generateOneTimeKeysJni(): success - result=%lu", static_cast<long unsigned int>(result));
255
256
257
258
            }
        }
    }

pedroGitt's avatar
pedroGitt committed
259
260
261
262
263
    if(NULL != randomBufferPtr)
    {
        free(randomBufferPtr);
    }

264
265
266
267
    return retCode;
}

/**
268
 * Get "one time keys".<br>
269
270
271
 * Return the public parts of the unpublished "one time keys" for the account
 * @return a valid byte array if operation succeed, null otherwise
**/
pedroGitt's avatar
pedroGitt committed
272
JNIEXPORT jbyteArray OLM_ACCOUNT_FUNC_DEF(oneTimeKeysJni)(JNIEnv *env, jobject thiz)
273
274
275
276
277
278
279
{
    OlmAccount* accountPtr = NULL;
    size_t keysLength;
    uint8_t *keysBytesPtr;
    size_t keysResult;
    jbyteArray byteArrayRetValue = NULL;

pedroGitt's avatar
pedroGitt committed
280
    LOGD("## oneTimeKeysJni(): IN");
281
282
283

    if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
pedroGitt's avatar
pedroGitt committed
284
        LOGE("## oneTimeKeysJni(): failure - invalid Account ptr");
285
286
287
288
289
290
    }
    else
    {   // keys memory allocation
        keysLength = olm_account_one_time_keys_length(accountPtr);
        if(NULL == (keysBytesPtr=(uint8_t *)malloc(keysLength*sizeof(uint8_t))))
        {
pedroGitt's avatar
pedroGitt committed
291
            LOGE("## oneTimeKeysJni(): failure - one time keys array OOM");
292
293
294
295
296
        }
        else
        {   // retrieve key pairs in keysBytesPtr
            keysResult = olm_account_one_time_keys(accountPtr, keysBytesPtr, keysLength);
            if(keysResult == olm_error()) {
297
                LOGE("## oneTimeKeysJni(): failure - error getting one time keys Msg=%s",(const char *)olm_account_last_error(accountPtr));
298
299
300
301
302
            }
            else
            {   // allocate the byte array to be returned to java
                if(NULL == (byteArrayRetValue=env->NewByteArray(keysLength)))
                {
pedroGitt's avatar
pedroGitt committed
303
                    LOGE("## oneTimeKeysJni(): failure - return byte array OOM");
304
305
306
307
                }
                else
                {
                    env->SetByteArrayRegion(byteArrayRetValue, 0/*offset*/, keysLength, (const jbyte*)keysBytesPtr);
pedroGitt's avatar
pedroGitt committed
308
                    LOGD("## oneTimeKeysJni(): success");
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
                }
            }

            free(keysBytesPtr);
        }
    }

    return byteArrayRetValue;
}

/**
 * Remove the "one time keys"  that the session used from the account.
 * Return the public parts of the unpublished "one time keys" for the account
 * @param aNativeOlmSessionId session instance
 * @return ERROR_CODE_OK if operation succeed, ERROR_CODE_NO_MATCHING_ONE_TIME_KEYS if no matching keys, ERROR_CODE_KO otherwise
**/
325
JNIEXPORT jint OLM_ACCOUNT_FUNC_DEF(removeOneTimeKeysForSessionJni)(JNIEnv *env, jobject thiz, jlong aNativeOlmSessionId)
326
327
328
329
330
331
332
333
{
    jint retCode = ERROR_CODE_KO;
    OlmAccount* accountPtr = NULL;
    OlmSession* sessionPtr = (OlmSession*)aNativeOlmSessionId;
    size_t result;

    if(NULL == sessionPtr)
    {
334
        LOGE("## removeOneTimeKeysForSessionJni(): failure - invalid session ptr");
335
336
337
    }
    else if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
338
        LOGE("## removeOneTimeKeysForSessionJni(): failure - invalid account ptr");
339
340
341
342
343
344
    }
    else
    {
        result = olm_remove_one_time_keys(accountPtr, sessionPtr);
        if(result == olm_error())
        {   // the account doesn't have any matching "one time keys"..
345
            LOGW("## removeOneTimeKeysForSessionJni(): failure - removing one time keys Msg=%s",(const char *)olm_account_last_error(accountPtr));
346
347
348
349
350
351

            retCode = ERROR_CODE_NO_MATCHING_ONE_TIME_KEYS;
        }
        else
        {
            retCode = ERROR_CODE_OK;
352
            LOGD("## removeOneTimeKeysForSessionJni(): success");
353
354
355
356
357
358
359
360
361
362
        }
    }

    return retCode;
}

/**
 * Mark the current set of "one time keys" as being published.
 * @return ERROR_CODE_OK if operation succeed, ERROR_CODE_KO otherwise
**/
363
JNIEXPORT jint OLM_ACCOUNT_FUNC_DEF(markOneTimeKeysAsPublishedJni)(JNIEnv *env, jobject thiz)
364
365
366
367
368
369
370
{
    jint retCode = ERROR_CODE_OK;
    OlmAccount* accountPtr = NULL;
    size_t result;

    if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
371
        LOGE("## markOneTimeKeysAsPublishedJni(): failure - invalid account ptr");
372
373
374
375
376
377
378
        retCode = ERROR_CODE_KO;
    }
    else
    {
        result = olm_account_mark_keys_as_published(accountPtr);
        if(result == olm_error())
        {
379
            LOGW("## markOneTimeKeysAsPublishedJni(): failure - Msg=%s",(const char *)olm_account_last_error(accountPtr));
380
381
382
383
            retCode = ERROR_CODE_KO;
        }
        else
        {
pedroGitt's avatar
pedroGitt committed
384
            LOGD("## markOneTimeKeysAsPublishedJni(): success - retCode=%lu",static_cast<long unsigned int>(result));
385
386
387
388
389
390
391
        }
    }

    return retCode;
}

/**
392
393
 * Sign a message with the ed25519 key (fingerprint) for this account.<br>
 * The signed message is returned by the function.
394
 * @param aMessage message to sign
395
 * @return the signed message, null otherwise
396
**/
397
JNIEXPORT jstring OLM_ACCOUNT_FUNC_DEF(signMessageJni)(JNIEnv *env, jobject thiz, jbyteArray aMessage)
398
399
400
{
    OlmAccount* accountPtr = NULL;
    size_t signatureLength;
401
    void* signedMsgPtr;
402
403
404
405
406
    size_t resultSign;
    jstring signedMsgRetValue = NULL;

    if(NULL == aMessage)
    {
407
        LOGE("## signMessageJni(): failure - invalid aMessage param");
408
409
410
    }
    else if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
411
        LOGE("## signMessageJni(): failure - invalid account ptr");
412
413
414
    }
    else
    {
415
416
417
418
419
420
421
        int messageLength = env->GetArrayLength(aMessage);
        unsigned char* messageToSign = new unsigned char[messageLength];
        env->GetByteArrayRegion(aMessage, 0, messageLength, reinterpret_cast<jbyte*>(messageToSign));

        // signature memory allocation
        signatureLength = olm_account_signature_length(accountPtr);
        if(NULL == (signedMsgPtr = (void*)malloc((signatureLength+1)*sizeof(uint8_t))))
422
        {
423
            LOGE("## signMessageJni(): failure - signature allocation OOM");
424
425
        }
        else
426
427
428
429
430
431
432
        {   // sign message
            resultSign = olm_account_sign(accountPtr,
                                         (void*)messageToSign,
                                         (size_t)messageLength,
                                         signedMsgPtr,
                                         signatureLength);
            if(resultSign == olm_error())
433
            {
434
                LOGE("## signMessageJni(): failure - error signing message Msg=%s",(const char *)olm_account_last_error(accountPtr));
435
436
            }
            else
437
438
439
440
441
442
            {
                // info: signatureLength is always equal to resultSign
                (static_cast<char*>(signedMsgPtr))[signatureLength] = static_cast<char>('\0');
                // convert to jstring
                signedMsgRetValue = env->NewStringUTF((const char*)signedMsgPtr); // UTF8
                LOGD("## signMessageJni(): success - retCode=%lu signatureLength=%lu", static_cast<long unsigned int>(resultSign), static_cast<long unsigned int>(signatureLength));
443
444
            }

445
            free(signedMsgPtr);
446
        }
447
448
449

        // release messageToSign
        free(messageToSign);
450
451
452
453
454
455
456
457
    }

    return signedMsgRetValue;
}




458
459
460
461
462
463
464
465
/**
* Serialize and encrypt account instance into a base64 string.<br>
* @param aKey key used to encrypt the serialized account data
* @param[out] aErrorMsg error message set if operation failed
* @return a base64 string if operation succeed, null otherwise
**/
JNIEXPORT jstring OLM_ACCOUNT_FUNC_DEF(serializeDataWithKeyJni)(JNIEnv *env, jobject thiz, jstring aKey, jobject aErrorMsg)
{
466
467
468
469
470
471
472
473
    /*jstring pickledDataRetValue = serializeDataWithKey(env,thiz,
                                                          aKey,
                                                          aErrorMsg,
                                                          olm_pickle_account_length,
                                                          olm_pickle_account,
                                                          olm_account_last_error);
    return pickledDataRetValue;*/

474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
    jstring pickledDataRetValue = 0;
    jclass errorMsgJClass = 0;
    jmethodID errorMsgMethodId = 0;
    jstring errorJstring = 0;
    const char *keyPtr = NULL;
    void *pickledPtr = NULL;
    OlmAccount* accountPtr = NULL;

    LOGD("## serializeDataWithKeyJni(): IN");

    if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    {
        LOGE(" ## serializeDataWithKeyJni(): failure - invalid account ptr");
    }
    else if(0 == aKey)
    {
        LOGE(" ## serializeDataWithKeyJni(): failure - invalid key");
    }
    else if(0 == aErrorMsg)
    {
        LOGE(" ## serializeDataWithKeyJni(): failure - invalid error object");
    }
    else if(0 == (errorMsgJClass = env->GetObjectClass(aErrorMsg)))
    {
        LOGE(" ## serializeDataWithKeyJni(): failure - unable to get error class");
    }
    else if(0 == (errorMsgMethodId = env->GetMethodID(errorMsgJClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;")))
    {
        LOGE(" ## serializeDataWithKeyJni(): failure - unable to get error method ID");
    }
    else if(NULL == (keyPtr = env->GetStringUTFChars(aKey, 0)))
    {
        LOGE(" ## serializeDataWithKeyJni(): failure - keyPtr JNI allocation OOM");
    }
    else
    {
        size_t pickledLength = olm_pickle_account_length(accountPtr);
        size_t keyLength = (size_t)env->GetStringUTFLength(aKey);
pedroGitt's avatar
pedroGitt committed
512
        LOGD(" ## serializeDataWithKeyJni(): pickledLength=%lu keyLength=%lu",static_cast<long unsigned int>(pickledLength), static_cast<long unsigned int>(keyLength));
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
        LOGD(" ## serializeDataWithKeyJni(): key=%s",(char const *)keyPtr);

        if(NULL == (pickledPtr = (void*)malloc((pickledLength+1)*sizeof(uint8_t))))
        {
            LOGE(" ## serializeDataWithKeyJni(): failure - pickledPtr buffer OOM");
        }
        else
        {
            size_t result = olm_pickle_account(accountPtr,
                                               (void const *)keyPtr,
                                               keyLength,
                                               (void*)pickledPtr,
                                               pickledLength);
            if(result == olm_error())
            {
                const char *errorMsgPtr = olm_account_last_error(accountPtr);
                LOGE(" ## serializeDataWithKeyJni(): failure - olm_pickle_account() Msg=%s",errorMsgPtr);

                if(0 != (errorJstring = env->NewStringUTF(errorMsgPtr)))
                {
                    env->CallObjectMethod(aErrorMsg, errorMsgMethodId, errorJstring);
                }
            }
            else
            {
                // build success output
                (static_cast<char*>(pickledPtr))[pickledLength] = static_cast<char>('\0');
                pickledDataRetValue = env->NewStringUTF((const char*)pickledPtr);
pedroGitt's avatar
pedroGitt committed
541
                LOGD(" ## serializeDataWithKeyJni(): success - result=%lu pickled=%s", static_cast<long unsigned int>(result), static_cast<char*>(pickledPtr));
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
            }
        }
    }

    // free alloc
    if(NULL != keyPtr)
    {
     env->ReleaseStringUTFChars(aKey, keyPtr);
    }

    if(NULL != pickledPtr)
    {
        free(pickledPtr);
    }

    return pickledDataRetValue;
}


JNIEXPORT jstring OLM_ACCOUNT_FUNC_DEF(initWithSerializedDataJni)(JNIEnv *env, jobject thiz, jstring aSerializedData, jstring aKey)
{
    OlmAccount* accountPtr = NULL;
    jstring errorMessageRetValue = 0;
    const char *keyPtr = NULL;
    const char *pickledPtr = NULL;

    LOGD("## initWithSerializedDataJni(): IN");

    if(NULL == (accountPtr = (OlmAccount*)getAccountInstanceId(env,thiz)))
    //if(NULL == (accountPtr = initializeAccountMemory()))
    {
        LOGE(" ## initWithSerializedDataJni(): failure - account failure OOM");
    }
    else if(0 == aKey)
    {
        LOGE(" ## initWithSerializedDataJni(): failure - invalid key");
    }
    else if(0 == aSerializedData)
    {
        LOGE(" ## initWithSerializedDataJni(): failure - serialized data");
    }
    else if(NULL == (keyPtr = env->GetStringUTFChars(aKey, 0)))
    {
        LOGE(" ## initWithSerializedDataJni(): failure - keyPtr JNI allocation OOM");
    }
    else if(NULL == (pickledPtr = env->GetStringUTFChars(aSerializedData, 0)))
    {
        LOGE(" ## initWithSerializedDataJni(): failure - pickledPtr JNI allocation OOM");
    }
    else
    {
        size_t pickledLength = (size_t)env->GetStringUTFLength(aSerializedData);
        size_t keyLength = (size_t)env->GetStringUTFLength(aKey);
pedroGitt's avatar
pedroGitt committed
595
        LOGD(" ## initWithSerializedDataJni(): pickledLength=%lu keyLength=%lu",static_cast<long unsigned int>(pickledLength), static_cast<long unsigned int>(keyLength));
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
        LOGD(" ## initWithSerializedDataJni(): key=%s",(char const *)keyPtr);
        LOGD(" ## initWithSerializedDataJni(): pickled=%s",(char const *)pickledPtr);

        size_t result = olm_unpickle_account(accountPtr,
                                             (void const *)keyPtr,
                                             keyLength,
                                             (void*)pickledPtr,
                                             pickledLength);
        if(result == olm_error())
        {
            const char *errorMsgPtr = olm_account_last_error(accountPtr);
            LOGE(" ## initWithSerializedDataJni(): failure - olm_unpickle_account() Msg=%s",errorMsgPtr);
            errorMessageRetValue = env->NewStringUTF(errorMsgPtr);
        }
        else
        {
pedroGitt's avatar
pedroGitt committed
612
            LOGD(" ## initWithSerializedDataJni(): success - result=%lu ", static_cast<long unsigned int>(result));
613
614
615
616
617
618
619
620
621
622
623
624
625
        }
    }

    // free alloc
    if(NULL != keyPtr)
    {
        env->ReleaseStringUTFChars(aKey, keyPtr);
    }

    if(NULL != pickledPtr)
    {
        env->ReleaseStringUTFChars(aSerializedData, pickledPtr);
    }
626

627
628
    return errorMessageRetValue;
}