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