IOSAD-72 correct names for reEvaluateMessag*
authorDirk Zimmermann <dirk@pep-project.org>
Thu, 08 Mar 2018 13:54:06 +0100
changeset 51600b69bd275b0
parent 515 3fea38d290ab
child 517 510fa8a4ff7f
IOSAD-72 correct names for reEvaluateMessag*
pEpObjCAdapter/PEPInternalSession.m
pEpObjCAdapter/PEPSession.m
pEpObjCAdapter/PEPSessionProtocol.h
     1.1 --- a/pEpObjCAdapter/PEPInternalSession.m	Thu Mar 08 13:37:33 2018 +0100
     1.2 +++ b/pEpObjCAdapter/PEPInternalSession.m	Thu Mar 08 13:54:06 2018 +0100
     1.3 @@ -177,11 +177,11 @@
     1.4      return YES;
     1.5  }
     1.6  
     1.7 -- (BOOL)reEvaluateMessageRating:(nonnull PEPDict *)src
     1.8 -                         rating:(PEP_rating * _Nullable)rating
     1.9 -                          error:(NSError * _Nullable * _Nullable)error
    1.10 +- (BOOL)reEvaluateMessageDict:(nonnull PEPDict *)messageDict
    1.11 +                       rating:(PEP_rating * _Nullable)rating
    1.12 +                        error:(NSError * _Nullable * _Nullable)error
    1.13  {
    1.14 -    message *_src = PEP_messageDictToStruct(src);
    1.15 +    message *_src = PEP_messageDictToStruct(messageDict);
    1.16      PEP_rating ratingByEngine = PEP_rating_undefined;
    1.17  
    1.18      [self lockWrite];
    1.19 @@ -204,11 +204,11 @@
    1.20      }
    1.21  }
    1.22  
    1.23 -- (BOOL)reEvaluateRatingForMessage:(nonnull PEPMessage *)src
    1.24 -                            rating:(PEP_rating * _Nullable)rating
    1.25 -                             error:(NSError * _Nullable * _Nullable)error
    1.26 +- (BOOL)reEvaluateMessage:(nonnull PEPMessage *)message
    1.27 +                   rating:(PEP_rating * _Nullable)rating
    1.28 +                    error:(NSError * _Nullable * _Nullable)error
    1.29  {
    1.30 -    return [self reEvaluateMessageRating:(PEPDict *) src rating:rating error:error];
    1.31 +    return [self reEvaluateMessageDict:(PEPDict *) message rating:rating error:error];
    1.32  }
    1.33  
    1.34  - (void)removeEmptyArrayKey:(NSString *)key inDict:(PEPMutableDict *)dict
     2.1 --- a/pEpObjCAdapter/PEPSession.m	Thu Mar 08 13:37:33 2018 +0100
     2.2 +++ b/pEpObjCAdapter/PEPSession.m	Thu Mar 08 13:54:06 2018 +0100
     2.3 @@ -39,18 +39,18 @@
     2.4      return [PEPSession decryptMessage:src dest:dst rating:rating keys:keys error:error];
     2.5  }
     2.6  
     2.7 -- (BOOL)reEvaluateMessageRating:(nonnull PEPDict *)src
     2.8 -                         rating:(PEP_rating * _Nullable)rating
     2.9 -                          error:(NSError * _Nullable * _Nullable)error
    2.10 +- (BOOL)reEvaluateMessageDict:(nonnull PEPDict *)messageDict
    2.11 +                       rating:(PEP_rating * _Nullable)rating
    2.12 +                        error:(NSError * _Nullable * _Nullable)error
    2.13  {
    2.14 -    return [PEPSession reEvaluateMessageRating:src rating:rating error:error];
    2.15 +    return [PEPSession reEvaluateMessageDict:messageDict rating:rating error:error];
    2.16  }
    2.17  
    2.18 -- (BOOL)reEvaluateRatingForMessage:(nonnull PEPMessage *)src
    2.19 -                            rating:(PEP_rating * _Nullable)rating
    2.20 -                             error:(NSError * _Nullable * _Nullable)error
    2.21 +- (BOOL)reEvaluateMessage:(nonnull PEPMessage *)message
    2.22 +                   rating:(PEP_rating * _Nullable)rating
    2.23 +                    error:(NSError * _Nullable * _Nullable)error
    2.24  {
    2.25 -    return [PEPSession reEvaluateRatingForMessage:src rating:rating error:error];
    2.26 +    return [PEPSession reEvaluateMessage:message rating:rating error:error];
    2.27  }
    2.28  
    2.29  - (PEP_STATUS)encryptMessageDict:(nonnull PEPDict *)src
    2.30 @@ -217,20 +217,20 @@
    2.31      return [session decryptMessage:src dest:dst rating:rating keys:keys error:error];
    2.32  }
    2.33  
    2.34 -+ (BOOL)reEvaluateMessageRating:(nonnull PEPDict *)src
    2.35 -                         rating:(PEP_rating * _Nullable)rating
    2.36 -                          error:(NSError * _Nullable * _Nullable)error
    2.37 ++ (BOOL)reEvaluateMessageDict:(nonnull PEPDict *)messageDict
    2.38 +                       rating:(PEP_rating * _Nullable)rating
    2.39 +                        error:(NSError * _Nullable * _Nullable)error
    2.40  {
    2.41      PEPInternalSession *session = [PEPSessionProvider session];
    2.42 -    return [session reEvaluateMessageRating:src rating:rating error:error];
    2.43 +    return [session reEvaluateMessageDict:messageDict rating:rating error:error];
    2.44  }
    2.45  
    2.46 -+ (BOOL)reEvaluateRatingForMessage:(nonnull PEPMessage *)src
    2.47 -                            rating:(PEP_rating * _Nullable)rating
    2.48 -                             error:(NSError * _Nullable * _Nullable)error
    2.49 ++ (BOOL)reEvaluateMessage:(nonnull PEPMessage *)message
    2.50 +                   rating:(PEP_rating * _Nullable)rating
    2.51 +                    error:(NSError * _Nullable * _Nullable)error
    2.52  {
    2.53      PEPInternalSession *session = [PEPSessionProvider session];
    2.54 -    return [session reEvaluateRatingForMessage:src rating:rating error:error];
    2.55 +    return [session reEvaluateMessage:message rating:rating error:error];
    2.56  }
    2.57  
    2.58  + (PEP_STATUS)encryptMessageDict:(nonnull PEPDict *)src
     3.1 --- a/pEpObjCAdapter/PEPSessionProtocol.h	Thu Mar 08 13:37:33 2018 +0100
     3.2 +++ b/pEpObjCAdapter/PEPSessionProtocol.h	Thu Mar 08 13:54:06 2018 +0100
     3.3 @@ -35,14 +35,14 @@
     3.4                   error:(NSError * _Nullable * _Nullable)error;
     3.5  
     3.6  /** Re-evaluate rating of decrypted message */
     3.7 -- (BOOL)reEvaluateMessageRating:(nonnull PEPDict *)src
     3.8 -                         rating:(PEP_rating * _Nullable)rating
     3.9 -                          error:(NSError * _Nullable * _Nullable)error __deprecated;
    3.10 +- (BOOL)reEvaluateMessageDict:(nonnull PEPDict *)messageDict
    3.11 +                       rating:(PEP_rating * _Nullable)rating
    3.12 +                        error:(NSError * _Nullable * _Nullable)error __deprecated;
    3.13  
    3.14  /** Re-evaluate rating of decrypted message */
    3.15 -- (BOOL)reEvaluateRatingForMessage:(nonnull PEPMessage *)src
    3.16 -                            rating:(PEP_rating * _Nullable)rating
    3.17 -                             error:(NSError * _Nullable * _Nullable)error;
    3.18 +- (BOOL)reEvaluateMessage:(nonnull PEPMessage *)message
    3.19 +                   rating:(PEP_rating * _Nullable)rating
    3.20 +                    error:(NSError * _Nullable * _Nullable)error;
    3.21  
    3.22  /** Encrypt a message dictionary */
    3.23  - (PEP_STATUS)encryptMessageDict:(nonnull PEPDict *)src