pEpObjCAdapter/PEPMessage.m
author Dirk Zimmermann <dirk@pep-project.org>
Mon, 30 Oct 2017 13:01:27 +0100
branchIOSAD-61
changeset 305 3e0a52fec0ec
parent 302 e1fd49a790e4
child 307 08b35bfa8d65
permissions -rw-r--r--
IOSAD-61 pEp_identity <-> PEPIdentity
dirk@187
     1
//
dirk@187
     2
//  PEPMessage.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@187
     9
#import "PEPMessage.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@187
   159
    for (NSMutableDictionary *blob in array) {
dirk@187
   160
        NSData *data = blob[@"data"];
dirk@187
   161
        size_t size = [data length];
dirk@187
   162
        
dirk@187
   163
        char *buf = malloc(size);
dirk@187
   164
        assert(buf);
dirk@187
   165
        memcpy(buf, [data bytes], size);
dirk@187
   166
        
dirk@187
   167
        bl = bloblist_add(bl, buf, size,
dirk@187
   168
                          [blob[@"mimeType"] UTF8String],
dirk@187
   169
                          [[blob[@"filename"] precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   170
    }
dirk@187
   171
    return _bl;
dirk@187
   172
}
dirk@187
   173
dirk@187
   174
NSDictionary *PEP_identityDictFromStruct(pEp_identity *ident)
dirk@187
   175
{
dirk@187
   176
    NSMutableDictionary *dict = [NSMutableDictionary new];
dirk@187
   177
dirk@187
   178
    if (ident) {
dirk@187
   179
        if (ident->address && ident->address[0])
dirk@238
   180
            [dict setObject:[NSString stringWithUTF8String:ident->address] forKey:kPepAddress];
dirk@187
   181
        
dirk@187
   182
        if (ident->fpr && ident->fpr[0])
dirk@238
   183
            [dict setObject:[NSString stringWithUTF8String:ident->fpr] forKey:kPepFingerprint];
dirk@187
   184
        
dirk@187
   185
        if (ident->user_id && ident->user_id[0])
dirk@238
   186
            [dict setObject:[NSString stringWithUTF8String:ident->user_id] forKey:kPepUserID];
dirk@187
   187
        
dirk@187
   188
        if (ident->username && ident->username[0])
dirk@238
   189
            [dict setObject:[NSString stringWithUTF8String:ident->username] forKey:kPepUsername];
dirk@187
   190
        
dirk@187
   191
        if (ident->lang[0])
dirk@187
   192
            [dict setObject:[NSString stringWithUTF8String:ident->lang] forKey:@"lang"];
dirk@187
   193
        
dirk@238
   194
        [dict setObject:[NSNumber numberWithInt: ident->comm_type] forKey:kPepCommType];
dirk@187
   195
        
dirk@187
   196
    }
dirk@187
   197
    return dict;
dirk@187
   198
}
dirk@187
   199
dirk@305
   200
PEPIdentity *PEP_identityFromStruct(pEp_identity *ident)
dirk@305
   201
{
dirk@305
   202
    if (ident) {
dirk@305
   203
        PEPIdentity *identity = nil;
dirk@305
   204
        if (ident->address && ident->address[0]) {
dirk@305
   205
            identity = [[PEPIdentity alloc]
dirk@305
   206
                        initWithAddress:[NSString stringWithUTF8String:ident->address]];
dirk@305
   207
        }
dirk@305
   208
dirk@305
   209
        if (ident->fpr && ident->fpr[0]) {
dirk@305
   210
            identity.fingerPrint = [NSString stringWithUTF8String:ident->fpr];
dirk@305
   211
        }
dirk@305
   212
dirk@305
   213
        if (ident->user_id && ident->user_id[0]) {
dirk@305
   214
            identity.userID = [NSString stringWithUTF8String:ident->user_id];
dirk@305
   215
        }
dirk@305
   216
dirk@305
   217
        if (ident->username && ident->username[0]) {
dirk@305
   218
            identity.userName = [NSString stringWithUTF8String:ident->username];
dirk@305
   219
        }
dirk@305
   220
dirk@305
   221
        if (ident->lang[0]) {
dirk@305
   222
            identity.language = [NSString stringWithUTF8String:ident->lang];
dirk@305
   223
        }
dirk@305
   224
dirk@305
   225
        identity.commType = ident->comm_type;
dirk@305
   226
dirk@305
   227
        return identity;
dirk@305
   228
    }
dirk@305
   229
    return nil;
dirk@305
   230
}
dirk@305
   231
dirk@305
   232
pEp_identity *PEP_identityToStruct(PEPIdentity *identity)
dirk@305
   233
{
dirk@305
   234
    pEp_identity *ident = new_identity(NULL, NULL, NULL, NULL);
dirk@305
   235
dirk@305
   236
    ident->address = strdup([[identity.address
dirk@305
   237
                              precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   238
dirk@305
   239
    if (identity.userID) {
dirk@305
   240
        ident->user_id = strdup([[identity.userID
dirk@305
   241
                              precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   242
    }
dirk@305
   243
dirk@305
   244
    if (identity.userName) {
dirk@305
   245
        ident->username = strdup([[identity.userName
dirk@305
   246
                              precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   247
    }
dirk@305
   248
dirk@305
   249
    if (identity.fingerPrint) {
dirk@305
   250
        ident->fpr = strdup([[identity.fingerPrint
dirk@305
   251
                              precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   252
    }
dirk@305
   253
dirk@305
   254
    if (identity.language) {
dirk@305
   255
        strncpy(ident->lang, [[identity.language
dirk@305
   256
                               precomposedStringWithCanonicalMapping] UTF8String], 2);
dirk@305
   257
    }
dirk@305
   258
dirk@305
   259
    ident->comm_type = identity.commType;
dirk@305
   260
    
dirk@305
   261
    return ident;
dirk@305
   262
}
dirk@305
   263
dirk@187
   264
pEp_identity *PEP_identityDictToStruct(NSDictionary *dict)
dirk@187
   265
{
dirk@187
   266
    pEp_identity *ident = new_identity(NULL, NULL, NULL, NULL);
dirk@305
   267
dirk@187
   268
    if (dict && ident) {
dirk@238
   269
        if ([dict objectForKey:kPepAddress])
dirk@238
   270
            ident->address = strdup([[[dict objectForKey:kPepAddress]
dirk@238
   271
                                      precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   272
dirk@238
   273
        if ([dict objectForKey:kPepFingerprint]) {
dirk@238
   274
            ident->fpr = strdup([[[dict objectForKey:kPepFingerprint]
dirk@238
   275
                                  precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   276
        }
dirk@305
   277
dirk@238
   278
        if ([dict objectForKey:kPepUserID]) {
dirk@238
   279
            ident->user_id = strdup([[[dict objectForKey:kPepUserID]
dirk@238
   280
                                      precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   281
        }
dirk@305
   282
dirk@238
   283
        if ([dict objectForKey:kPepUsername])
dirk@238
   284
            ident->username = strdup([[[dict objectForKey:kPepUsername]
dirk@238
   285
                                       precomposedStringWithCanonicalMapping] UTF8String]);
dirk@305
   286
dirk@187
   287
        if ([dict objectForKey:@"lang"])
dirk@238
   288
            strncpy(ident->fpr, [[[dict objectForKey:@"lang"]
dirk@238
   289
                                  precomposedStringWithCanonicalMapping] UTF8String], 2);
dirk@305
   290
dirk@238
   291
        if ([dict objectForKey:kPepCommType])
dirk@238
   292
            ident->comm_type = [[dict objectForKey:kPepCommType] intValue];
dirk@187
   293
    }
dirk@305
   294
dirk@187
   295
    return ident;
dirk@187
   296
}
dirk@187
   297
dirk@187
   298
NSArray *PEP_arrayFromIdentityList(identity_list *il)
dirk@187
   299
{
dirk@187
   300
    NSMutableArray *array = [NSMutableArray array];
dirk@187
   301
    
dirk@187
   302
    for (identity_list *_il = il; _il && _il->ident; _il = _il->next) {
dirk@187
   303
        [array addObject:PEP_identityDictFromStruct(il->ident)];
dirk@187
   304
    }
dirk@187
   305
    
dirk@187
   306
    return array;
dirk@187
   307
}
dirk@187
   308
dirk@187
   309
identity_list *PEP_arrayToIdentityList(NSArray *array)
dirk@187
   310
{
dirk@187
   311
    identity_list *il = new_identity_list(NULL);
dirk@187
   312
    if (!il)
dirk@187
   313
        return NULL;
dirk@187
   314
    
dirk@187
   315
    identity_list *_il = il;
dirk@187
   316
    for (NSDictionary *dict in array) {
dirk@187
   317
        _il = identity_list_add(_il, PEP_identityDictToStruct(dict));
dirk@187
   318
    }
dirk@187
   319
    
dirk@187
   320
    return il;
dirk@187
   321
}
dirk@187
   322
dirk@187
   323
identity_list *PEP_identityArrayToList(NSArray *array)
dirk@187
   324
{
dirk@187
   325
    identity_list *il = new_identity_list(NULL);
dirk@187
   326
    if (!il)
dirk@187
   327
        return NULL;
dirk@187
   328
    
dirk@187
   329
    identity_list *_il = il;
dirk@187
   330
    for (NSMutableDictionary *address in array) {
dirk@187
   331
        _il = identity_list_add(_il, PEP_identityDictToStruct(address));
dirk@187
   332
    }
dirk@187
   333
    
dirk@187
   334
    return il;
dirk@187
   335
}
dirk@187
   336
dirk@187
   337
NSArray *PEP_identityArrayFromList(identity_list *il)
dirk@187
   338
{
dirk@187
   339
    NSMutableArray *array = [NSMutableArray array];
dirk@187
   340
    
dirk@187
   341
    for (identity_list *_il = il; _il && _il->ident; _il = _il->next) {
dirk@187
   342
        NSDictionary *address = PEP_identityDictFromStruct(_il->ident);
dirk@187
   343
        [array addObject:address];
dirk@187
   344
    }
dirk@187
   345
    
dirk@187
   346
    return array;
dirk@187
   347
}
dirk@187
   348
dirk@187
   349
NSDictionary *PEP_messageDictFromStruct(message *msg)
dirk@187
   350
{
dirk@187
   351
    NSMutableDictionary *dict = [NSMutableDictionary new];
dirk@187
   352
    if (msg && dict) {
dirk@187
   353
dirk@187
   354
        [dict setObject:(msg->dir==PEP_dir_outgoing)?@YES:@NO forKey:@"outgoing"];
dirk@187
   355
dirk@187
   356
        if (msg->id)
dirk@187
   357
            [dict setObject:[NSString stringWithUTF8String:msg->id] forKey:@"id"];
dirk@187
   358
        
dirk@187
   359
        if (msg->shortmsg)
dirk@187
   360
            [dict setObject:[NSString stringWithUTF8String:msg->shortmsg] forKey:@"shortmsg"];
dirk@187
   361
dirk@187
   362
        if (msg->sent)
dirk@187
   363
            [dict setObject:[NSDate dateWithTimeIntervalSince1970:timegm(msg->sent)] forKey:@"sent"];
dirk@187
   364
        
dirk@187
   365
        if (msg->recv)
dirk@187
   366
            [dict setObject:[NSDate dateWithTimeIntervalSince1970:mktime(msg->recv)] forKey:@"recv"];
dirk@187
   367
        
dirk@187
   368
        if (msg->from)
dirk@238
   369
            [dict setObject:PEP_identityDictFromStruct(msg->from) forKey:kPepFrom];
dirk@187
   370
        
dirk@187
   371
        if (msg->to && msg->to->ident)
dirk@187
   372
            [dict setObject:PEP_identityArrayFromList(msg->to) forKey:@"to"];
dirk@187
   373
        
dirk@187
   374
        if (msg->recv_by)
dirk@187
   375
            [dict setObject:PEP_identityDictFromStruct(msg->recv_by) forKey:@"recv_by"];
dirk@187
   376
        
dirk@187
   377
        if (msg->cc && msg->cc->ident)
dirk@187
   378
            [dict setObject:PEP_identityArrayFromList(msg->cc) forKey:@"cc"];
dirk@187
   379
        
dirk@187
   380
        if (msg->bcc && msg->bcc->ident)
dirk@187
   381
            [dict setObject:PEP_identityArrayFromList(msg->bcc) forKey:@"bcc"];
dirk@187
   382
        
dirk@187
   383
        if (msg->reply_to && msg->reply_to->ident)
dirk@187
   384
            [dict setObject:PEP_identityArrayFromList(msg->reply_to) forKey:@"reply_to"];
dirk@187
   385
        
dirk@187
   386
        if (msg->in_reply_to)
dirk@187
   387
            [dict setObject:PEP_arrayFromStringlist(msg->in_reply_to) forKey:@"in_reply_to"];
dirk@187
   388
dirk@187
   389
        if (msg->references && msg->references->value)
dirk@187
   390
            [dict setObject:PEP_arrayFromStringlist(msg->references) forKey:kPepReferences];
dirk@187
   391
dirk@187
   392
        if (msg->keywords && msg->keywords->value)
dirk@187
   393
            [dict setObject:PEP_arrayFromStringlist(msg->keywords) forKey:@"keywords"];
dirk@187
   394
dirk@187
   395
        if (msg->opt_fields)
dirk@187
   396
            [dict setObject:PEP_arrayFromStringPairlist(msg->opt_fields) forKey:@"opt_fields"];
dirk@187
   397
        
dirk@187
   398
        if (msg->longmsg_formatted)
dirk@187
   399
            [dict setObject:[NSString stringWithUTF8String:msg->longmsg_formatted]
dirk@187
   400
                     forKey:@"longmsg_formatted"];
dirk@187
   401
dirk@187
   402
        if (msg->longmsg)
dirk@187
   403
            [dict setObject:[NSString stringWithUTF8String:msg->longmsg] forKey:@"longmsg"];
dirk@187
   404
        
dirk@187
   405
        if (msg->attachments && msg->attachments->value)
dirk@187
   406
            [dict setObject: PEP_arrayFromBloblist(msg->attachments) forKey:@"attachments"];
dirk@187
   407
dirk@187
   408
        if (msg->rawmsg_size > 0 && *msg->rawmsg_ref) {
dirk@187
   409
            NSData *data = [NSData dataWithBytes:msg->rawmsg_ref length:msg->rawmsg_size];
dirk@187
   410
            dict[kPepRawMessage] = data;
dirk@187
   411
        }
dirk@187
   412
dirk@187
   413
        return dict;
dirk@187
   414
    }
dirk@187
   415
    return nil;
dirk@187
   416
}
dirk@187
   417
dirk@187
   418
message *PEP_messageDictToStruct(NSDictionary *dict)
dirk@187
   419
{
dirk@187
   420
    // Direction default to incoming
dirk@187
   421
    PEP_msg_direction dir = PEP_dir_incoming;
dirk@187
   422
    
dirk@187
   423
    if ([dict objectForKey:@"outgoing"])
dirk@187
   424
        dir = [[dict objectForKey:@"outgoing"] boolValue] ? PEP_dir_outgoing : PEP_dir_incoming;
dirk@187
   425
    
dirk@187
   426
    message *msg = new_message(dir);
dirk@187
   427
    
dirk@187
   428
    if(!msg)
dirk@187
   429
        return NULL;
dirk@187
   430
    
dirk@187
   431
    if ([dict objectForKey:@"id"])
dirk@187
   432
        msg->id = strdup([[[dict objectForKey:@"id"] precomposedStringWithCanonicalMapping]
dirk@187
   433
                          UTF8String]);
dirk@187
   434
    
dirk@187
   435
    if ([dict objectForKey:@"shortmsg"])
dirk@187
   436
        msg->shortmsg = strdup([[[dict objectForKey:@"shortmsg"]
dirk@187
   437
                                 precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   438
dirk@187
   439
    if ([dict objectForKey:@"sent"])
dirk@187
   440
        msg->sent = new_timestamp([[dict objectForKey:@"sent"] timeIntervalSince1970]);
dirk@187
   441
    
dirk@187
   442
    if ([dict objectForKey:@"recv"])
dirk@187
   443
        msg->recv = new_timestamp([[dict objectForKey:@"recv"] timeIntervalSince1970]);
dirk@187
   444
    
dirk@238
   445
    if ([dict objectForKey:kPepFrom])
dirk@238
   446
        msg->from = PEP_identityDictToStruct([dict objectForKey:kPepFrom]);
dirk@187
   447
dirk@187
   448
    if ([dict objectForKey:@"to"])
dirk@187
   449
        msg->to = PEP_identityArrayToList([dict objectForKey:@"to"]);
dirk@187
   450
dirk@187
   451
    if ([dict objectForKey:@"recv_by"])
dirk@187
   452
        msg->recv_by = PEP_identityDictToStruct([dict objectForKey:@"recv_by"]);
dirk@187
   453
dirk@187
   454
    if ([dict objectForKey:@"cc"])
dirk@187
   455
        msg->cc = PEP_identityArrayToList([dict objectForKey:@"cc"]);
dirk@187
   456
dirk@187
   457
    if ([dict objectForKey:@"bcc"])
dirk@187
   458
        msg->bcc = PEP_identityArrayToList([dict objectForKey:@"bcc"]);
dirk@187
   459
    
dirk@187
   460
    if ([dict objectForKey:@"reply_to"])
dirk@187
   461
        msg->reply_to = PEP_identityArrayToList([dict objectForKey:@"reply_to"]);
dirk@187
   462
    
dirk@187
   463
    if ([dict objectForKey:@"in_reply_to"])
dirk@187
   464
        msg->in_reply_to = PEP_arrayToStringlist([dict objectForKey:@"in_reply_to"]);
dirk@187
   465
    
dirk@187
   466
    if ([dict objectForKey:@"references"])
dirk@187
   467
        msg->references = PEP_arrayToStringlist([dict objectForKey:@"references"]);
dirk@187
   468
    
dirk@187
   469
    if ([dict objectForKey:kPepKeywords])
dirk@187
   470
        msg->keywords = PEP_arrayToStringlist([dict objectForKey:kPepKeywords]);
dirk@187
   471
dirk@187
   472
    if ([dict objectForKey:@"opt_fields"])
dirk@187
   473
        msg->opt_fields = PEP_arrayToStringPairlist([dict objectForKey:@"opt_fields"]);
dirk@187
   474
    
dirk@187
   475
    if ([dict objectForKey:@"longmsg"])
dirk@187
   476
        msg->longmsg = strdup([[[dict objectForKey:@"longmsg"]
dirk@187
   477
             precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   478
    
dirk@187
   479
    if ([dict objectForKey:@"longmsg_formatted"])
dirk@187
   480
        msg->longmsg_formatted = strdup([[[dict objectForKey:@"longmsg_formatted"]
dirk@187
   481
             precomposedStringWithCanonicalMapping] UTF8String]);
dirk@187
   482
dirk@187
   483
    if ([dict objectForKey:@"attachments"])
dirk@187
   484
        msg->attachments = PEP_arrayToBloblist([dict objectForKey:@"attachments"]);
dirk@187
   485
dirk@187
   486
    return msg;
dirk@187
   487
}