pEpObjCAdapter/PEPMessageUtil.m
branchrefactor
changeset 903 e9428f52fd88
parent 902 32760267cd59
child 915 487e2f5ddc16
     1.1 --- a/pEpObjCAdapter/PEPMessageUtil.m	Wed Feb 20 09:18:34 2019 +0100
     1.2 +++ b/pEpObjCAdapter/PEPMessageUtil.m	Thu Mar 21 12:37:32 2019 +0100
     1.3 @@ -8,68 +8,15 @@
     1.4  
     1.5  #import "PEPMessageUtil.h"
     1.6  
     1.7 +#import "PEPConstants.h"
     1.8  #import "PEPIdentity.h"
     1.9 +
    1.10  #import "PEPMessage.h"
    1.11  #import "PEPAttachment.h"
    1.12  #import "NSMutableDictionary+PEP.h"
    1.13  
    1.14  #import "pEp_string.h"
    1.15  
    1.16 -#pragma mark -- Constants
    1.17 -
    1.18 -NSString *const kPepUsername = @"username";
    1.19 -
    1.20 -NSString *const kPepAddress = @"address";
    1.21 -
    1.22 -NSString *const kPepUserID = @"user_id";
    1.23 -
    1.24 -NSString *const kPepIsOwn = @"isOwn";
    1.25 -
    1.26 -NSString *const kPepFingerprint = @"fpr";
    1.27 -
    1.28 -NSString *const kPepFrom = @"from";
    1.29 -
    1.30 -NSString *const kPepTo = @"to";
    1.31 -
    1.32 -NSString *const kPepCC = @"cc";
    1.33 -
    1.34 -NSString *const kPepBCC = @"bcc";
    1.35 -
    1.36 -NSString *const kPepShortMessage = @"shortmsg";
    1.37 -
    1.38 -NSString *const kPepLongMessage = @"longmsg";
    1.39 -
    1.40 -NSString *const kPepLongMessageFormatted = @"longmsg_formatted";
    1.41 -
    1.42 -NSString *const kPepOutgoing = @"outgoing";
    1.43 -
    1.44 -NSString *const kPepSent = @"sent";
    1.45 -
    1.46 -NSString *const kPepReceived = @"recv";
    1.47 -
    1.48 -NSString *const kPepID = @"id";
    1.49 -
    1.50 -NSString *const kPepReceivedBy = @"recv_by";
    1.51 -NSString *const kPepReplyTo = @"reply_to";
    1.52 -NSString *const kPepInReplyTo = @"in_reply_to";
    1.53 -NSString *const kPepReferences = @"references";
    1.54 -NSString *const kPepKeywords = @"keywords";
    1.55 -NSString *const kPepOptFields = @"opt_fields";
    1.56 -
    1.57 -NSString *const kPepAttachments = @"attachments";
    1.58 -
    1.59 -NSString *const kPepCommType = @"comm_type";
    1.60 -
    1.61 -NSString *const kPepRawMessage = @"raw_message";
    1.62 -
    1.63 -NSString *const kXpEpVersion = @"X-pEp-Version";
    1.64 -
    1.65 -NSString *const kXEncStatus = @"X-EncStatus";
    1.66 -
    1.67 -NSString *const kXKeylist = @"X-KeyList";
    1.68 -
    1.69 -NSString *const _Nonnull kPepIsOwnIdentity = @"kPepIsOwnIdentity";
    1.70 -
    1.71  NSArray *PEP_arrayFromStringlist(stringlist_t *sl)
    1.72  {
    1.73      NSMutableArray *array = [NSMutableArray array];