pEpObjCAdapter/PEPSession.m
changeset 523 3d167bef8afa
parent 522 534d277b410d
child 524 60dbfc88af73
     1.1 --- a/pEpObjCAdapter/PEPSession.m	Mon Mar 12 12:08:38 2018 +0100
     1.2 +++ b/pEpObjCAdapter/PEPSession.m	Mon Mar 12 12:08:39 2018 +0100
     1.3 @@ -21,22 +21,22 @@
     1.4      [PEPSessionProvider cleanup];
     1.5  }
     1.6  
     1.7 -- (PEPDict * _Nullable)decryptMessageDict:(nonnull PEPDict *)src
     1.8 +- (PEPDict * _Nullable)decryptMessageDict:(nonnull PEPDict *)messageDict
     1.9                                     rating:(PEP_rating * _Nullable)rating
    1.10 -                                     keys:(PEPStringList * _Nullable * _Nullable)keys
    1.11 +                                extraKeys:(PEPStringList * _Nullable * _Nullable)extraKeys
    1.12                                      error:(NSError * _Nullable * _Nullable)error
    1.13  {
    1.14      PEPInternalSession *session = [PEPSessionProvider session];
    1.15 -    return [session decryptMessageDict:src rating:rating keys:keys error:error];
    1.16 +    return [session decryptMessageDict:messageDict rating:rating extraKeys:extraKeys error:error];
    1.17  }
    1.18  
    1.19 -- (PEPMessage * _Nullable)decryptMessage:(nonnull PEPMessage *)src
    1.20 +- (PEPMessage * _Nullable)decryptMessage:(nonnull PEPMessage *)message
    1.21                                    rating:(PEP_rating * _Nullable)rating
    1.22 -                                    keys:(PEPStringList * _Nullable * _Nullable)keys
    1.23 +                               extraKeys:(PEPStringList * _Nullable * _Nullable)extraKeys
    1.24                                     error:(NSError * _Nullable * _Nullable)error
    1.25  {
    1.26      PEPInternalSession *session = [PEPSessionProvider session];
    1.27 -    return [session decryptMessage:src rating:rating keys:keys error:error];
    1.28 +    return [session decryptMessage:message rating:rating extraKeys:extraKeys error:error];
    1.29  }
    1.30  
    1.31  - (BOOL)reEvaluateMessageDict:(nonnull PEPDict *)messageDict
    1.32 @@ -55,46 +55,50 @@
    1.33      return [session reEvaluateMessage:message rating:rating error:error];
    1.34  }
    1.35  
    1.36 -- (PEPDict * _Nullable)encryptMessageDict:(nonnull PEPDict *)src
    1.37 +- (PEPDict * _Nullable)encryptMessageDict:(nonnull PEPDict *)messageDict
    1.38                                      extraKeys:(nullable PEPStringList *)extraKeys
    1.39                                  encFormat:(PEP_enc_format)encFormat
    1.40                                      error:(NSError * _Nullable * _Nullable)error
    1.41  {
    1.42      PEPInternalSession *session = [PEPSessionProvider session];
    1.43 -    return [session encryptMessageDict:src extraKeys:extraKeys encFormat:encFormat error:error];
    1.44 +    return [session
    1.45 +            encryptMessageDict:messageDict
    1.46 +            extraKeys:extraKeys
    1.47 +            encFormat:encFormat
    1.48 +            error:error];
    1.49  }
    1.50  
    1.51 -- (PEPMessage * _Nullable)encryptMessage:(nonnull PEPMessage *)src
    1.52 -                                   extraKeys:(nullable PEPStringList *)extraKeys
    1.53 +- (PEPMessage * _Nullable)encryptMessage:(nonnull PEPMessage *)message
    1.54 +                               extraKeys:(nullable PEPStringList *)extraKeys
    1.55                                 encFormat:(PEP_enc_format)encFormat
    1.56                                     error:(NSError * _Nullable * _Nullable)error
    1.57  {
    1.58      PEPInternalSession *session = [PEPSessionProvider session];
    1.59 -    return [session encryptMessage:src extraKeys:extraKeys encFormat:encFormat error:error];
    1.60 +    return [session encryptMessage:message extraKeys:extraKeys encFormat:encFormat error:error];
    1.61  }
    1.62  
    1.63 -- (PEPMessage * _Nullable)encryptMessage:(nonnull PEPMessage *)src
    1.64 -                                   extraKeys:(nullable PEPStringList *)extraKeys
    1.65 +- (PEPMessage * _Nullable)encryptMessage:(nonnull PEPMessage *)message
    1.66 +                               extraKeys:(nullable PEPStringList *)extraKeys
    1.67                                     error:(NSError * _Nullable * _Nullable)error
    1.68  {
    1.69      PEPInternalSession *session = [PEPSessionProvider session];
    1.70 -    return [session encryptMessage:src extraKeys:extraKeys error:error];
    1.71 +    return [session encryptMessage:message extraKeys:extraKeys error:error];
    1.72  }
    1.73  
    1.74 -- (PEP_STATUS)encryptMessageDict:(nonnull PEPDict *)src
    1.75 +- (PEP_STATUS)encryptMessageDict:(nonnull PEPDict *)messageDict
    1.76                          identity:(nonnull PEPIdentity *)identity
    1.77                              dest:(PEPDict * _Nullable * _Nullable)dst
    1.78  {
    1.79      PEPInternalSession *session = [PEPSessionProvider session];
    1.80 -    return [session encryptMessageDict:src identity:identity dest:dst];
    1.81 +    return [session encryptMessageDict:messageDict identity:identity dest:dst];
    1.82  }
    1.83  
    1.84 -- (PEP_STATUS)encryptMessage:(nonnull PEPMessage *)src
    1.85 +- (PEP_STATUS)encryptMessage:(nonnull PEPMessage *)message
    1.86                      identity:(nonnull PEPIdentity *)identity
    1.87                          dest:(PEPMessage * _Nullable * _Nullable)dst
    1.88  {
    1.89      PEPInternalSession *session = [PEPSessionProvider session];
    1.90 -    return [session encryptMessage:src identity:identity dest:dst];
    1.91 +    return [session encryptMessage:message identity:identity dest:dst];
    1.92  }
    1.93  
    1.94  - (PEP_rating)outgoingColorForMessage:(nonnull PEPMessage *)message