merge default IOS-1576
authorbuff <andreas@pep-project.org>
Tue, 16 Jul 2019 15:40:41 +0200
branchIOS-1576
changeset 10692814cc3b5e69
parent 1057 8ebf1e349f8a
parent 1068 0d033e967ac7
child 1166 37d9d61ab313
merge default
     1.1 --- a/pEpObjCAdapter/PEPInternalSession.m	Mon Jul 08 16:37:07 2019 +0200
     1.2 +++ b/pEpObjCAdapter/PEPInternalSession.m	Tue Jul 16 15:40:41 2019 +0200
     1.3 @@ -282,7 +282,6 @@
     1.4      message *_dst = NULL;
     1.5      stringlist_t *_keys = PEP_arrayToStringlist(extraKeys);
     1.6  
     1.7 -    [self lockWrite];
     1.8      PEPStatus theStatus = (PEPStatus) encrypt_message(
     1.9                                                        _session,
    1.10                                                        _src,
    1.11 @@ -290,7 +289,6 @@
    1.12                                                        &_dst,
    1.13                                                        (PEP_enc_format) encFormat,
    1.14                                                        flags);
    1.15 -    [self unlockWrite];
    1.16  
    1.17      if (status) {
    1.18          *status = theStatus;
     2.1 --- a/pEpObjCAdapter/PEPMessage.m	Mon Jul 08 16:37:07 2019 +0200
     2.2 +++ b/pEpObjCAdapter/PEPMessage.m	Tue Jul 16 15:40:41 2019 +0200
     2.3 @@ -234,6 +234,10 @@
     2.4          [result addObject:@[kPepLongMessageFormatted, self.longMessageFormatted]];
     2.5      }
     2.6  
     2.7 +    if (self.attachments) {
     2.8 +        [result addObject:@[kPepAttachments, self.attachments]];
     2.9 +    }
    2.10 +
    2.11      BOOL outgoing = self.direction == PEP_dir_outgoing ? YES:NO;
    2.12      [result addObject:@[kPepOutgoing, [NSNumber numberWithBool:outgoing]]];
    2.13  
     3.1 --- a/pEpObjCTests/TestUtils/PEPTestUtils.m	Mon Jul 08 16:37:07 2019 +0200
     3.2 +++ b/pEpObjCTests/TestUtils/PEPTestUtils.m	Tue Jul 16 15:40:41 2019 +0200
     3.3 @@ -120,13 +120,20 @@
     3.4  {
     3.5      // Only files whose content is affected by tests.
     3.6      NSString *home = [[[NSProcessInfo processInfo]environment]objectForKey:@"HOME"];
     3.7 -    NSString *gpgHome = [home stringByAppendingPathComponent:@".gnupg"];
     3.8 -    return @[[home stringByAppendingPathComponent:@".pEp_keys.db"],
     3.9 -             [home stringByAppendingPathComponent:@".pEp_keys.db-shm"],
    3.10 -             [home stringByAppendingPathComponent:@".pEp_keys.db-wal"],
    3.11 -             [gpgHome stringByAppendingPathComponent:@"pubring.gpg"],
    3.12 -             [gpgHome stringByAppendingPathComponent:@"secring.gpg"]];
    3.13 +
    3.14 +    NSArray *baseNames = @[@".pEp_keys", @".pEp_management"];
    3.15 +    NSArray *baseEndings = @[@"db", @"db-shm", @"db-wal"];
    3.16 +
    3.17 +    NSMutableArray *result = [NSMutableArray array];
    3.18  
    3.19 +    for (NSString *base in baseNames) {
    3.20 +        for (NSString *ending in baseEndings) {
    3.21 +            NSString *filename = [NSString stringWithFormat:@"%@.%@", base, ending];
    3.22 +            [result addObject:[home stringByAppendingPathComponent:filename]];
    3.23 +        }
    3.24 +    }
    3.25 +
    3.26 +    return result;
    3.27  }
    3.28  
    3.29  + (void)cleanUp