pEpObjCAdapter/PEPMessageUtil.m
author Dirk Zimmermann <dirk@pep-project.org>
Mon, 22 Jan 2018 12:22:46 +0100
branchIOSAD-70
changeset 394 1e656b3d4948
parent 367 7dedf5391bb3
child 395 1be9b4daf09a
permissions -rw-r--r--
IOSAD-70 PEP_arrayToBloblist: release_value
dirk@187
     1
//
dirk@367
     2
//  PEPMessageUtil.m
dirk@187
     3
//  pEpiOSAdapter
dirk@187
     4
//
dirk@187
     5
//  Created by Volker Birk on 09.07.15.
dirk@187
     6
//  Copyright (c) 2015 p≡p. All rights reserved.
dirk@187
     7
//
dirk@187
     8
dirk@367
     9
#import "PEPMessageUtil.h"
dirk@305
    10
#import "PEPIdentity.h"
dirk@187
    11
dirk@187
    12
#pragma mark -- Constants
dirk@187
    13
dirk@187
    14
NSString *const kPepUsername = @"username";
dirk@187
    15
dirk@187
    16
NSString *const kPepAddress = @"address";
dirk@187
    17
dirk@187
    18
NSString *const kPepUserID = @"user_id";
dirk@187
    19
dirk@187
    20
NSString *const kPepFingerprint = @"fpr";
dirk@187
    21
dirk@187
    22
NSString *const kPepFrom = @"from";
dirk@187
    23
dirk@187
    24
NSString *const kPepTo = @"to";
dirk@187
    25
dirk@187
    26
NSString *const kPepCC = @"cc";
dirk@187
    27
dirk@187
    28
NSString *const kPepBCC = @"bcc";
dirk@187
    29
dirk@187
    30
NSString *const kPepShortMessage = @"shortmsg";
dirk@187
    31
dirk@187
    32
NSString *const kPepLongMessage = @"longmsg";
dirk@187
    33
dirk@187
    34
NSString *const kPepLongMessageFormatted = @"longmsg_formatted";
dirk@187
    35
dirk@187
    36
NSString *const kPepOutgoing = @"outgoing";
dirk@187
    37
dirk@187
    38
NSString *const kPepSent = @"sent";
dirk@187
    39
dirk@187
    40
NSString *const kPepReceived = @"recv";
dirk@187
    41
dirk@187
    42
NSString *const kPepID = @"id";
dirk@187
    43
dirk@187
    44
NSString *const kPepReceivedBy = @"recv_by";
dirk@187
    45
NSString *const kPepReplyTo = @"reply_to";
dirk@187
    46
NSString *const kPepInReplyTo = @"in_reply_to";
dirk@187
    47
NSString *const kPepReferences = @"references";
dirk@187
    48
NSString *const kPepKeywords = @"keywords";
dirk@187
    49
NSString *const kPepOptFields = @"opt_fields";
dirk@187
    50
dirk@187
    51
NSString *const kPepAttachments = @"attachments";
dirk@187
    52
dirk@187
    53
NSString *const kPepMimeData = @"data";
dirk@187
    54
dirk@187
    55
NSString *const kPepMimeFilename = @"filename";
dirk@187
    56
dirk@187
    57
NSString *const kPepMimeType = @"mimeType";
dirk@187
    58
dirk@187
    59
NSString *const kPepCommType = @"comm_type";
dirk@187
    60
dirk@187
    61
NSString *const kPepRawMessage = @"raw_message";
dirk@187
    62
dirk@187
    63
NSString *const kXpEpVersion = @"X-pEp-Version";
dirk@187
    64
dirk@187
    65
NSString *const kXEncStatus = @"X-EncStatus";
dirk@187
    66
dirk@187
    67
NSString *const kXKeylist = @"X-KeyList";
dirk@187
    68
dirk@302
    69
NSString *const _Nonnull kPepIsOwnIdentity = @"kPepIsOwnIdentity";
dirk@302
    70
dirk@187
    71
NSArray *PEP_arrayFromStringlist(stringlist_t *sl)
dirk@187
    72
{
dirk@187
    73
    NSMutableArray *array = [NSMutableArray array];
dirk@187
    74
    
dirk@187
    75
    for (stringlist_t *_sl = sl; _sl && _sl->value; _sl = _sl->next) {
dirk@187
    76
        [array addObject:[NSString stringWithUTF8String:_sl->value]];
dirk@187
    77
    }
dirk@187
    78
    
dirk@187
    79
    return array;
dirk@187
    80
}
dirk@187
    81
dirk@187
    82
stringlist_t *PEP_arrayToStringlist(NSArray *array)
dirk@187
    83
{
dirk@187
    84
    stringlist_t *sl = new_stringlist(NULL);
dirk@187
    85
    if (!sl)
dirk@187
    86
        return NULL;
dirk@187
    87
    
dirk@187
    88
    stringlist_t *_sl = sl;
dirk@187
    89
    for (NSString *str in array) {
dirk@187
    90
        _sl = stringlist_add(_sl, [[str precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
    91
    }
dirk@187
    92
    
dirk@187
    93
    return sl;
dirk@187
    94
}
dirk@187
    95
dirk@187
    96
NSArray *PEP_arrayFromStringPairlist(stringpair_list_t *sl)
dirk@187
    97
{
dirk@187
    98
    NSMutableArray *array = [NSMutableArray array];
dirk@187
    99
dirk@187
   100
    for (stringpair_list_t *_sl = sl; _sl && _sl->value; _sl = _sl->next) {
dirk@187
   101
        [array addObject:[[NSMutableArray alloc ]initWithObjects:
dirk@187
   102
                [NSString stringWithUTF8String:_sl->value->key],
dirk@187
   103
                [NSString stringWithUTF8String:_sl->value->value],
dirk@187
   104
                nil]];
dirk@187
   105
    }
dirk@187
   106
dirk@187
   107
    return array;
dirk@187
   108
}
dirk@187
   109
dirk@187
   110
stringpair_list_t *PEP_arrayToStringPairlist(NSArray *array)
dirk@187
   111
{
dirk@187
   112
    stringpair_list_t *sl = new_stringpair_list(NULL);
dirk@187
   113
    if (!sl)
dirk@187
   114
        return NULL;
dirk@187
   115
    
dirk@187
   116
    stringpair_list_t *_sl = sl;
dirk@187
   117
    for (NSArray *pair in array) {
dirk@187
   118
        stringpair_t *_sp = new_stringpair(
dirk@187
   119
               [[pair[0] precomposedStringWithCanonicalMapping] UTF8String],
dirk@187
   120
               [[pair[1] precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   121
        _sl = stringpair_list_add(_sl, _sp);
dirk@187
   122
    }
dirk@187
   123
    
dirk@187
   124
    return sl;
dirk@187
   125
}
dirk@187
   126
dirk@187
   127
dirk@187
   128
NSArray *PEP_arrayFromBloblist(bloblist_t *bl)
dirk@187
   129
{
dirk@187
   130
    NSMutableArray *array = [NSMutableArray array];
dirk@187
   131
    
dirk@187
   132
    for (bloblist_t *_bl = bl; _bl && _bl->value; _bl = _bl->next) {
dirk@187
   133
        NSMutableDictionary* blob = [NSMutableDictionary new];
dirk@187
   134
        [blob setObject: [NSData dataWithBytes:_bl->value
dirk@187
   135
                                 length:_bl->size]
dirk@187
   136
              forKey:@"data"];
dirk@187
   137
        
dirk@187
   138
        if(_bl->filename && _bl->filename[0])
dirk@187
   139
            [blob setObject:[NSString stringWithUTF8String:_bl->filename]
dirk@187
   140
                 forKey:@"filename"];
dirk@187
   141
        
dirk@187
   142
        if(_bl->mime_type && _bl->mime_type[0])
dirk@187
   143
            [blob setObject: [NSString stringWithUTF8String:_bl->mime_type]
dirk@187
   144
                 forKey:@"mimeType"];
dirk@187
   145
        
dirk@187
   146
        [array addObject:blob];
dirk@187
   147
    }
dirk@187
   148
    return array;
dirk@187
   149
}
dirk@187
   150
dirk@187
   151
bloblist_t *PEP_arrayToBloblist(NSArray *array)
dirk@187
   152
{
dirk@187
   153
    if (array.count == 0) {
dirk@187
   154
        return nil;
dirk@187
   155
    }
dirk@187
   156
dirk@187
   157
    bloblist_t *_bl = new_bloblist(NULL, 0, NULL, NULL);
dirk@187
   158
    bloblist_t *bl =_bl;
dirk@394
   159
dirk@394
   160
    // free() might be the default, but let's be explicit
dirk@394
   161
    bl->release_value = (void (*) (char *)) free;
dirk@394
   162
dirk@187
   163
    for (NSMutableDictionary *blob in array) {
dirk@187
   164
        NSData *data = blob[@"data"];
dirk@187
   165
        size_t size = [data length];
dirk@394
   166
dirk@187
   167
        char *buf = malloc(size);
dirk@187
   168
        assert(buf);
dirk@187
   169
        memcpy(buf, [data bytes], size);
dirk@187
   170
        
dirk@187
   171
        bl = bloblist_add(bl, buf, size,
dirk@187
   172
                          [blob[@"mimeType"] UTF8String],
dirk@187
   173
                          [[blob[@"filename"] precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   174
    }
dirk@187
   175
    return _bl;
dirk@187
   176
}
dirk@187
   177
dirk@187
   178
pEp_identity *PEP_identityDictToStruct(NSDictionary *dict)
dirk@187
   179
{
dirk@187
   180
    pEp_identity *ident = new_identity(NULL, NULL, NULL, NULL);
dirk@305
   181
dirk@187
   182
    if (dict && ident) {
dirk@238
   183
        if ([dict objectForKey:kPepAddress])
dirk@238
   184
            ident->address = strdup([[[dict objectForKey:kPepAddress]
dirk@238
   185
                                      precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   186
dirk@238
   187
        if ([dict objectForKey:kPepFingerprint]) {
dirk@238
   188
            ident->fpr = strdup([[[dict objectForKey:kPepFingerprint]
dirk@238
   189
                                  precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   190
        }
dirk@305
   191
dirk@238
   192
        if ([dict objectForKey:kPepUserID]) {
dirk@238
   193
            ident->user_id = strdup([[[dict objectForKey:kPepUserID]
dirk@238
   194
                                      precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   195
        }
dirk@305
   196
dirk@238
   197
        if ([dict objectForKey:kPepUsername])
dirk@238
   198
            ident->username = strdup([[[dict objectForKey:kPepUsername]
dirk@238
   199
                                       precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   200
dirk@187
   201
        if ([dict objectForKey:@"lang"])
dirk@238
   202
            strncpy(ident->fpr, [[[dict objectForKey:@"lang"]
dirk@238
   203
                                  precomposedStringWithCanonicalMapping] UTF8String], 2);
dirk@305
   204
dirk@238
   205
        if ([dict objectForKey:kPepCommType])
dirk@238
   206
            ident->comm_type = [[dict objectForKey:kPepCommType] intValue];
dirk@187
   207
    }
dirk@305
   208
dirk@187
   209
    return ident;
dirk@187
   210
}
dirk@187
   211
dirk@307
   212
NSDictionary *PEP_identityDictFromStruct(pEp_identity *ident)
dirk@307
   213
{
dirk@307
   214
    NSMutableDictionary *dict = [NSMutableDictionary new];
dirk@307
   215
dirk@307
   216
    if (ident) {
dirk@307
   217
        if (ident->address && ident->address[0])
dirk@307
   218
            [dict setObject:[NSString stringWithUTF8String:ident->address] forKey:kPepAddress];
dirk@307
   219
        
dirk@307
   220
        if (ident->fpr && ident->fpr[0])
dirk@307
   221
            [dict setObject:[NSString stringWithUTF8String:ident->fpr] forKey:kPepFingerprint];
dirk@307
   222
        
dirk@307
   223
        if (ident->user_id && ident->user_id[0])
dirk@307
   224
            [dict setObject:[NSString stringWithUTF8String:ident->user_id] forKey:kPepUserID];
dirk@307
   225
        
dirk@307
   226
        if (ident->username && ident->username[0])
dirk@307
   227
            [dict setObject:[NSString stringWithUTF8String:ident->username] forKey:kPepUsername];
dirk@307
   228
        
dirk@307
   229
        if (ident->lang[0])
dirk@307
   230
            [dict setObject:[NSString stringWithUTF8String:ident->lang] forKey:@"lang"];
dirk@307
   231
        
dirk@307
   232
        [dict setObject:[NSNumber numberWithInt: ident->comm_type] forKey:kPepCommType];
dirk@307
   233
        
dirk@307
   234
    }
dirk@307
   235
    return dict;
dirk@307
   236
}
dirk@307
   237
dirk@307
   238
pEp_identity *PEP_identityToStruct(PEPIdentity *identity)
dirk@307
   239
{
dirk@307
   240
    pEp_identity *ident = new_identity(NULL, NULL, NULL, NULL);
dirk@307
   241
dirk@307
   242
    ident->address = strdup([[identity.address
dirk@307
   243
                              precomposedStringWithCanonicalMapping] UTF8String]);
dirk@307
   244
dirk@307
   245
    if (identity.userID) {
dirk@307
   246
        ident->user_id = strdup([[identity.userID
dirk@307
   247
                                  precomposedStringWithCanonicalMapping] UTF8String]);
dirk@307
   248
    }
dirk@307
   249
dirk@307
   250
    if (identity.userName) {
dirk@307
   251
        ident->username = strdup([[identity.userName
dirk@307
   252
                                   precomposedStringWithCanonicalMapping] UTF8String]);
dirk@307
   253
    }
dirk@307
   254
dirk@307
   255
    if (identity.fingerPrint) {
dirk@307
   256
        ident->fpr = strdup([[identity.fingerPrint
dirk@307
   257
                              precomposedStringWithCanonicalMapping] UTF8String]);
dirk@307
   258
    }
dirk@307
   259
dirk@307
   260
    if (identity.language) {
dirk@307
   261
        strncpy(ident->lang, [[identity.language
dirk@307
   262
                               precomposedStringWithCanonicalMapping] UTF8String], 2);
dirk@307
   263
    }
dirk@307
   264
dirk@307
   265
    ident->comm_type = (PEP_comm_type) identity.commType;
dirk@307
   266
dirk@307
   267
    return ident;
dirk@307
   268
}
dirk@307
   269
dirk@307
   270
PEPIdentity *PEP_identityFromStruct(pEp_identity *ident)
dirk@307
   271
{
dirk@307
   272
    PEPIdentity *identity = nil;
dirk@307
   273
    if (ident->address && ident->address[0]) {
dirk@307
   274
        identity = [[PEPIdentity alloc]
dirk@307
   275
                    initWithAddress:[NSString stringWithUTF8String:ident->address]];
dirk@307
   276
    }
dirk@307
   277
dirk@307
   278
    if (ident->fpr && ident->fpr[0]) {
dirk@307
   279
        identity.fingerPrint = [NSString stringWithUTF8String:ident->fpr];
dirk@307
   280
    }
dirk@307
   281
dirk@307
   282
    if (ident->user_id && ident->user_id[0]) {
dirk@307
   283
        identity.userID = [NSString stringWithUTF8String:ident->user_id];
dirk@307
   284
    }
dirk@307
   285
dirk@307
   286
    if (ident->username && ident->username[0]) {
dirk@307
   287
        identity.userName = [NSString stringWithUTF8String:ident->username];
dirk@307
   288
    }
dirk@307
   289
dirk@307
   290
    if (ident->lang[0]) {
dirk@307
   291
        identity.language = [NSString stringWithUTF8String:ident->lang];
dirk@307
   292
    }
dirk@307
   293
dirk@307
   294
    identity.commType = ident->comm_type;
dirk@307
   295
dirk@307
   296
    return identity;
dirk@307
   297
}
dirk@307
   298
dirk@187
   299
NSArray *PEP_arrayFromIdentityList(identity_list *il)
dirk@187
   300
{
dirk@187
   301
    NSMutableArray *array = [NSMutableArray array];
dirk@187
   302
    
dirk@187
   303
    for (identity_list *_il = il; _il && _il->ident; _il = _il->next) {
dirk@353
   304
        [array addObject:PEP_identityFromStruct(il->ident)];
dirk@187
   305
    }
dirk@187
   306
    
dirk@187
   307
    return array;
dirk@187
   308
}
dirk@187
   309
dirk@187
   310
identity_list *PEP_arrayToIdentityList(NSArray *array)
dirk@187
   311
{
dirk@187
   312
    identity_list *il = new_identity_list(NULL);
dirk@187
   313
    if (!il)
dirk@187
   314
        return NULL;
dirk@187
   315
    
dirk@187
   316
    identity_list *_il = il;
dirk@187
   317
    for (NSDictionary *dict in array) {
dirk@187
   318
        _il = identity_list_add(_il, PEP_identityDictToStruct(dict));
dirk@187
   319
    }
dirk@187
   320
    
dirk@187
   321
    return il;
dirk@187
   322
}
dirk@187
   323
dirk@187
   324
identity_list *PEP_identityArrayToList(NSArray *array)
dirk@187
   325
{
dirk@187
   326
    identity_list *il = new_identity_list(NULL);
dirk@187
   327
    if (!il)
dirk@187
   328
        return NULL;
dirk@187
   329
    
dirk@187
   330
    identity_list *_il = il;
dirk@187
   331
    for (NSMutableDictionary *address in array) {
dirk@187
   332
        _il = identity_list_add(_il, PEP_identityDictToStruct(address));
dirk@187
   333
    }
dirk@187
   334
    
dirk@187
   335
    return il;
dirk@187
   336
}
dirk@187
   337
dirk@187
   338
NSArray *PEP_identityArrayFromList(identity_list *il)
dirk@187
   339
{
dirk@187
   340
    NSMutableArray *array = [NSMutableArray array];
dirk@187
   341
    
dirk@187
   342
    for (identity_list *_il = il; _il && _il->ident; _il = _il->next) {
dirk@353
   343
        PEPIdentity *ident = PEP_identityFromStruct(_il->ident);
dirk@353
   344
        [array addObject:ident];
dirk@187
   345
    }
dirk@187
   346
    
dirk@187
   347
    return array;
dirk@187
   348
}
dirk@187
   349
dirk@187
   350
NSDictionary *PEP_messageDictFromStruct(message *msg)
dirk@187
   351
{
dirk@187
   352
    NSMutableDictionary *dict = [NSMutableDictionary new];
dirk@187
   353
    if (msg && dict) {
dirk@187
   354
dirk@187
   355
        [dict setObject:(msg->dir==PEP_dir_outgoing)?@YES:@NO forKey:@"outgoing"];
dirk@187
   356
dirk@187
   357
        if (msg->id)
dirk@187
   358
            [dict setObject:[NSString stringWithUTF8String:msg->id] forKey:@"id"];
dirk@187
   359
        
dirk@187
   360
        if (msg->shortmsg)
dirk@187
   361
            [dict setObject:[NSString stringWithUTF8String:msg->shortmsg] forKey:@"shortmsg"];
dirk@187
   362
dirk@187
   363
        if (msg->sent)
dirk@187
   364
            [dict setObject:[NSDate dateWithTimeIntervalSince1970:timegm(msg->sent)] forKey:@"sent"];
dirk@187
   365
        
dirk@187
   366
        if (msg->recv)
dirk@187
   367
            [dict setObject:[NSDate dateWithTimeIntervalSince1970:mktime(msg->recv)] forKey:@"recv"];
dirk@187
   368
        
dirk@187
   369
        if (msg->from)
dirk@353
   370
            [dict setObject:PEP_identityFromStruct(msg->from) forKey:kPepFrom];
dirk@187
   371
        
dirk@187
   372
        if (msg->to && msg->to->ident)
dirk@187
   373
            [dict setObject:PEP_identityArrayFromList(msg->to) forKey:@"to"];
dirk@187
   374
        
dirk@187
   375
        if (msg->recv_by)
dirk@353
   376
            [dict setObject:PEP_identityFromStruct(msg->recv_by) forKey:@"recv_by"];
dirk@187
   377
        
dirk@187
   378
        if (msg->cc && msg->cc->ident)
dirk@187
   379
            [dict setObject:PEP_identityArrayFromList(msg->cc) forKey:@"cc"];
dirk@187
   380
        
dirk@187
   381
        if (msg->bcc && msg->bcc->ident)
dirk@187
   382
            [dict setObject:PEP_identityArrayFromList(msg->bcc) forKey:@"bcc"];
dirk@187
   383
        
dirk@187
   384
        if (msg->reply_to && msg->reply_to->ident)
dirk@187
   385
            [dict setObject:PEP_identityArrayFromList(msg->reply_to) forKey:@"reply_to"];
dirk@187
   386
        
dirk@187
   387
        if (msg->in_reply_to)
dirk@187
   388
            [dict setObject:PEP_arrayFromStringlist(msg->in_reply_to) forKey:@"in_reply_to"];
dirk@187
   389
dirk@187
   390
        if (msg->references && msg->references->value)
dirk@187
   391
            [dict setObject:PEP_arrayFromStringlist(msg->references) forKey:kPepReferences];
dirk@187
   392
dirk@187
   393
        if (msg->keywords && msg->keywords->value)
dirk@187
   394
            [dict setObject:PEP_arrayFromStringlist(msg->keywords) forKey:@"keywords"];
dirk@187
   395
dirk@187
   396
        if (msg->opt_fields)
dirk@187
   397
            [dict setObject:PEP_arrayFromStringPairlist(msg->opt_fields) forKey:@"opt_fields"];
dirk@187
   398
        
dirk@187
   399
        if (msg->longmsg_formatted)
dirk@187
   400
            [dict setObject:[NSString stringWithUTF8String:msg->longmsg_formatted]
dirk@187
   401
                     forKey:@"longmsg_formatted"];
dirk@187
   402
dirk@187
   403
        if (msg->longmsg)
dirk@187
   404
            [dict setObject:[NSString stringWithUTF8String:msg->longmsg] forKey:@"longmsg"];
dirk@187
   405
        
dirk@187
   406
        if (msg->attachments && msg->attachments->value)
dirk@187
   407
            [dict setObject: PEP_arrayFromBloblist(msg->attachments) forKey:@"attachments"];
dirk@187
   408
dirk@187
   409
        if (msg->rawmsg_size > 0 && *msg->rawmsg_ref) {
dirk@187
   410
            NSData *data = [NSData dataWithBytes:msg->rawmsg_ref length:msg->rawmsg_size];
dirk@187
   411
            dict[kPepRawMessage] = data;
dirk@187
   412
        }
dirk@187
   413
dirk@187
   414
        return dict;
dirk@187
   415
    }
dirk@187
   416
    return nil;
dirk@187
   417
}
dirk@187
   418
dirk@187
   419
message *PEP_messageDictToStruct(NSDictionary *dict)
dirk@187
   420
{
dirk@187
   421
    // Direction default to incoming
dirk@187
   422
    PEP_msg_direction dir = PEP_dir_incoming;
dirk@187
   423
    
dirk@187
   424
    if ([dict objectForKey:@"outgoing"])
dirk@187
   425
        dir = [[dict objectForKey:@"outgoing"] boolValue] ? PEP_dir_outgoing : PEP_dir_incoming;
dirk@187
   426
    
dirk@187
   427
    message *msg = new_message(dir);
dirk@187
   428
    
dirk@187
   429
    if(!msg)
dirk@187
   430
        return NULL;
dirk@187
   431
    
dirk@187
   432
    if ([dict objectForKey:@"id"])
dirk@187
   433
        msg->id = strdup([[[dict objectForKey:@"id"] precomposedStringWithCanonicalMapping]
dirk@187
   434
                          UTF8String]);
dirk@187
   435
    
dirk@187
   436
    if ([dict objectForKey:@"shortmsg"])
dirk@187
   437
        msg->shortmsg = strdup([[[dict objectForKey:@"shortmsg"]
dirk@187
   438
                                 precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   439
dirk@187
   440
    if ([dict objectForKey:@"sent"])
dirk@187
   441
        msg->sent = new_timestamp([[dict objectForKey:@"sent"] timeIntervalSince1970]);
dirk@187
   442
    
dirk@187
   443
    if ([dict objectForKey:@"recv"])
dirk@187
   444
        msg->recv = new_timestamp([[dict objectForKey:@"recv"] timeIntervalSince1970]);
dirk@187
   445
    
dirk@238
   446
    if ([dict objectForKey:kPepFrom])
dirk@238
   447
        msg->from = PEP_identityDictToStruct([dict objectForKey:kPepFrom]);
dirk@187
   448
dirk@187
   449
    if ([dict objectForKey:@"to"])
dirk@187
   450
        msg->to = PEP_identityArrayToList([dict objectForKey:@"to"]);
dirk@187
   451
dirk@187
   452
    if ([dict objectForKey:@"recv_by"])
dirk@187
   453
        msg->recv_by = PEP_identityDictToStruct([dict objectForKey:@"recv_by"]);
dirk@187
   454
dirk@187
   455
    if ([dict objectForKey:@"cc"])
dirk@187
   456
        msg->cc = PEP_identityArrayToList([dict objectForKey:@"cc"]);
dirk@187
   457
dirk@187
   458
    if ([dict objectForKey:@"bcc"])
dirk@187
   459
        msg->bcc = PEP_identityArrayToList([dict objectForKey:@"bcc"]);
dirk@187
   460
    
dirk@187
   461
    if ([dict objectForKey:@"reply_to"])
dirk@187
   462
        msg->reply_to = PEP_identityArrayToList([dict objectForKey:@"reply_to"]);
dirk@187
   463
    
dirk@187
   464
    if ([dict objectForKey:@"in_reply_to"])
dirk@187
   465
        msg->in_reply_to = PEP_arrayToStringlist([dict objectForKey:@"in_reply_to"]);
dirk@187
   466
    
dirk@187
   467
    if ([dict objectForKey:@"references"])
dirk@187
   468
        msg->references = PEP_arrayToStringlist([dict objectForKey:@"references"]);
dirk@187
   469
    
dirk@187
   470
    if ([dict objectForKey:kPepKeywords])
dirk@187
   471
        msg->keywords = PEP_arrayToStringlist([dict objectForKey:kPepKeywords]);
dirk@187
   472
dirk@187
   473
    if ([dict objectForKey:@"opt_fields"])
dirk@187
   474
        msg->opt_fields = PEP_arrayToStringPairlist([dict objectForKey:@"opt_fields"]);
dirk@187
   475
    
dirk@187
   476
    if ([dict objectForKey:@"longmsg"])
dirk@187
   477
        msg->longmsg = strdup([[[dict objectForKey:@"longmsg"]
dirk@187
   478
             precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   479
    
dirk@187
   480
    if ([dict objectForKey:@"longmsg_formatted"])
dirk@187
   481
        msg->longmsg_formatted = strdup([[[dict objectForKey:@"longmsg_formatted"]
dirk@187
   482
             precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   483
dirk@187
   484
    if ([dict objectForKey:@"attachments"])
dirk@187
   485
        msg->attachments = PEP_arrayToBloblist([dict objectForKey:@"attachments"]);
dirk@187
   486
dirk@187
   487
    return msg;
dirk@187
   488
}