IOSAD-92 merge in default

pEpObjCAdapter/PEPInternalSession.h

@@ -28,6 +28,6 @@
 
  @param enabled Whether or not mail subjects should be encrypted when using this session
  */
-- (void)configUnencryptedSubjectEnabled:(BOOL)enabled;
+- (void)configUnEncryptedSubjectEnabled:(BOOL)enabled;
 
 @end

pEpObjCAdapter/PEPInternalSession.m

@@ -53,7 +53,7 @@
 
 #pragma mark - CONFIG
 
-- (void)configUnencryptedSubjectEnabled:(BOOL)enabled;
+- (void)configUnEncryptedSubjectEnabled:(BOOL)enabled;
 {
     config_unencrypted_subject(self.session, enabled);
 }

pEpObjCAdapter/PEPObjCAdapter+Internal.h

@@ -21,7 +21,7 @@
 
  @return Whether or not mail subjects should be encrypted
  */
-+ (BOOL)unecryptedSubjectEnabled;
++ (BOOL)unEncryptedSubjectEnabled;
 
 // this messages are for internal use only; do not call
 

pEpObjCAdapter/PEPObjCAdapter.h

@@ -36,7 +36,7 @@
 
  @param enabled Whether or not mail subjects should be encrypted
  */
-+ (void)setUnecryptedSubjectEnabled:(BOOL)enabled;
++ (void)setUnEncryptedSubjectEnabled:(BOOL)enabled;
 
 /**
  The HOME URL, where all pEp related files will be stored.

pEpObjCAdapter/PEPObjCAdapter.m

@@ -104,20 +104,20 @@ void *retrieve_next_sync_msg(void *unused_mamagement, time_t *timeout)
 const char* _Nullable SystemDB = NULL;
 NSURL *s_homeURL;
 static NSLock *s_writeLock;
-static BOOL s_unecryptedSubjectEnabled = NO;
+static BOOL s_unEncryptedSubjectEnabled = NO;
 
 @implementation PEPObjCAdapter
 
 #pragma mark - SUBJECT PROTECTION
 
-+ (BOOL)unecryptedSubjectEnabled;
++ (BOOL)unEncryptedSubjectEnabled;
 {
-    return s_unecryptedSubjectEnabled;
+    return s_unEncryptedSubjectEnabled;
 }
 
-+ (void)setUnecryptedSubjectEnabled:(BOOL)enabled;
++ (void)setUnEncryptedSubjectEnabled:(BOOL)enabled;
 {
-    s_unecryptedSubjectEnabled = enabled;
+    s_unEncryptedSubjectEnabled = enabled;
 }
 
 #pragma mark - DB PATHS

pEpObjCAdapter/PEPSessionProvider.m

@@ -44,7 +44,7 @@ static PEPInternalSession *s_sessionForMainThread = nil;
         newOrExistingSession = [PEPInternalSession new];
         dict[currentThread] = newOrExistingSession;
     }
-    [self setConfigUnencryptedSubjectOnSession:newOrExistingSession];
+    [self setConfigUnEncryptedSubjectOnSession:newOrExistingSession];
     [self nullifySessionsOfFinishedThreads];
 
     [[self sessionForThreadLock] unlock];
@@ -83,10 +83,10 @@ static PEPInternalSession *s_sessionForMainThread = nil;
 
 #pragma mark -
 
-+ (void)setConfigUnencryptedSubjectOnSession:(PEPInternalSession *)session
++ (void)setConfigUnEncryptedSubjectOnSession:(PEPInternalSession *)session
 {
-    BOOL unencryptedSubjectEnabled = [PEPObjCAdapter unecryptedSubjectEnabled];
-    [session configUnencryptedSubjectEnabled:unencryptedSubjectEnabled];
+    BOOL unEncryptedSubjectEnabled = [PEPObjCAdapter unEncryptedSubjectEnabled];
+    [session configUnEncryptedSubjectEnabled:unEncryptedSubjectEnabled];
 }
 
 /**
@@ -103,7 +103,7 @@ static PEPInternalSession *s_sessionForMainThread = nil;
             return;
         }
         s_sessionForMainThread = [PEPInternalSession new];
-        [self setConfigUnencryptedSubjectOnSession:s_sessionForMainThread];
+        [self setConfigUnEncryptedSubjectOnSession:s_sessionForMainThread];
     };
 
 

pEpObjCTests/PEPSessionTest.m

@@ -24,7 +24,7 @@
 - (void)setUp
 {
     [super setUp];
-    [PEPObjCAdapter setUnecryptedSubjectEnabled:NO];
+    [PEPObjCAdapter setUnEncryptedSubjectEnabled:NO];
 
     [self pEpCleanUp];
 }
@@ -1184,7 +1184,7 @@
 - (void)testConfigUnencryptedSubject
 {
     // Setup Config to encrypt subject
-    [PEPObjCAdapter setUnecryptedSubjectEnabled:NO];
+    [PEPObjCAdapter setUnEncryptedSubjectEnabled:NO];
 
     // Write mail to yourself ...
     PEPMessage *encMessage = [self mailWrittenToMySelf];
@@ -1193,16 +1193,16 @@
     XCTAssertEqualObjects(encMessage.shortMessage, @"p≡p", @"Subject should be encrypted");
 }
 
-- (void)testConfigUnencryptedSubject_encryptedSubjectDisabled
+- (void)testConfigUnencryptedSubjectEncryptedSubjectDisabled
 {
     // Setup Config to not encrypt subject
-    [PEPObjCAdapter setUnecryptedSubjectEnabled:YES];
+    [PEPObjCAdapter setUnEncryptedSubjectEnabled:YES];
 
     // Write mail to yourself ...
     PEPMessage *encMessage = [self mailWrittenToMySelf];
 
-    // ... and assert the subject is not encrypted
-    XCTAssertNotEqualObjects(encMessage.shortMessage, @"p≡p", @"Subject should not be encrypted");
+    // pEp to pEp uses message 2.0, which always encrypts subjects (ENGINE-429)
+    XCTAssertEqualObjects(encMessage.shortMessage, @"p≡p", @"Subject should be encrypted");
 }
 
 #pragma mark - Helpers