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