IOSAD-123 Better method name. IOSAD-123
authorDirk Zimmermann <dz@pep.security>
Tue, 23 Jul 2019 16:05:32 +0200
branchIOSAD-123
changeset 1097e4bd8bed57d9
parent 1096 94a663ebfb1a
child 1099 73b5bd4d21f5
IOSAD-123 Better method name.
pEpObjCAdapter/NSMutableDictionary+PEP.m
pEpObjCAdapter/PEPInternalSession.m
pEpObjCAdapter/PEPMessageUtil.h
pEpObjCAdapter/PEPMessageUtil.m
     1.1 --- a/pEpObjCAdapter/NSMutableDictionary+PEP.m	Tue Jul 23 16:05:32 2019 +0200
     1.2 +++ b/pEpObjCAdapter/NSMutableDictionary+PEP.m	Tue Jul 23 16:05:32 2019 +0200
     1.3 @@ -41,7 +41,7 @@
     1.4      }
     1.5      
     1.6      if (message->to && message->to->ident) {
     1.7 -        [dict setValue:PEP_arrayFromIdentityList(message->to) forKey:kPepTo];
     1.8 +        [dict setValue:PEPIdentityArrayFromIdentityList(message->to) forKey:kPepTo];
     1.9      }
    1.10      
    1.11      if (message->recv_by) {
    1.12 @@ -49,15 +49,15 @@
    1.13      }
    1.14      
    1.15      if (message->cc && message->cc->ident) {
    1.16 -        [dict setValue:PEP_arrayFromIdentityList(message->cc) forKey:kPepCC];
    1.17 +        [dict setValue:PEPIdentityArrayFromIdentityList(message->cc) forKey:kPepCC];
    1.18      }
    1.19      
    1.20      if (message->bcc && message->bcc->ident) {
    1.21 -        [dict setValue:PEP_arrayFromIdentityList(message->bcc) forKey:kPepBCC];
    1.22 +        [dict setValue:PEPIdentityArrayFromIdentityList(message->bcc) forKey:kPepBCC];
    1.23      }
    1.24      
    1.25      if (message->reply_to && message->reply_to->ident) {
    1.26 -        [dict setValue:PEP_arrayFromIdentityList(message->reply_to) forKey:kPepReplyTo];
    1.27 +        [dict setValue:PEPIdentityArrayFromIdentityList(message->reply_to) forKey:kPepReplyTo];
    1.28      }
    1.29      
    1.30      if (message->in_reply_to) {
     2.1 --- a/pEpObjCAdapter/PEPInternalSession.m	Tue Jul 23 16:05:32 2019 +0200
     2.2 +++ b/pEpObjCAdapter/PEPInternalSession.m	Tue Jul 23 16:05:32 2019 +0200
     2.3 @@ -669,7 +669,7 @@
     2.4          }
     2.5      }
     2.6  
     2.7 -    NSArray *idents = PEP_arrayFromIdentityList(identList);
     2.8 +    NSArray *idents = PEPIdentityArrayFromIdentityList(identList);
     2.9      free(identList);
    2.10  
    2.11      return idents;
     3.1 --- a/pEpObjCAdapter/PEPMessageUtil.h	Tue Jul 23 16:05:32 2019 +0200
     3.2 +++ b/pEpObjCAdapter/PEPMessageUtil.h	Tue Jul 23 16:05:32 2019 +0200
     3.3 @@ -23,7 +23,7 @@
     3.4   */
     3.5  PEPIdentity * _Nullable PEP_identityFromStruct(pEp_identity * _Nonnull ident);
     3.6  
     3.7 -NSArray<PEPIdentity *> * _Nonnull PEP_arrayFromIdentityList(identity_list * _Nonnull il);
     3.8 +NSArray<PEPIdentity *> * _Nonnull PEPIdentityArrayFromIdentityList(identity_list * _Nonnull il);
     3.9  identity_list * _Nullable PEP_identityArrayToList(NSArray<PEPIdentity *> * _Nullable array);
    3.10  
    3.11  pEp_identity * _Nullable PEP_identityDictToStruct(NSDictionary * _Nullable dict);
     4.1 --- a/pEpObjCAdapter/PEPMessageUtil.m	Tue Jul 23 16:05:32 2019 +0200
     4.2 +++ b/pEpObjCAdapter/PEPMessageUtil.m	Tue Jul 23 16:05:32 2019 +0200
     4.3 @@ -237,7 +237,7 @@
     4.4      return identity;
     4.5  }
     4.6  
     4.7 -NSArray<PEPIdentity *> *PEP_arrayFromIdentityList(identity_list *il)
     4.8 +NSArray<PEPIdentity *> *PEPIdentityArrayFromIdentityList(identity_list *il)
     4.9  {
    4.10      NSMutableArray *array = [NSMutableArray array];
    4.11