diff --git a/ObjectivePGP.framework/Headers/ObjectivePGPObject.h b/ObjectivePGP.framework/Headers/ObjectivePGPObject.h index e596e2a0eec86d2c270893a8864356e1a3093b57..c448e10960a5b940a5c8cd59f891d8715454ade8 100644 --- a/ObjectivePGP.framework/Headers/ObjectivePGPObject.h +++ b/ObjectivePGP.framework/Headers/ObjectivePGPObject.h @@ -109,8 +109,6 @@ NS_ASSUME_NONNULL_BEGIN */ + (nullable NSData *)decrypt:(NSData *)data andVerifySignature:(BOOL)verifySignature usingKeys:(NSArray<PGPKey *> *)keys passphraseForKey:(nullable NSString * _Nullable(^NS_NOESCAPE)(PGPKey * _Nullable key))passphraseBlock error:(NSError * __autoreleasing _Nullable *)error; -+ (nullable NSData *)decrypt:(NSData *)data verified:(BOOL * _Nullable)verified usingKeys:(NSArray<PGPKey *> *)keys passphraseForKey:(nullable NSString * _Nullable(^NS_NOESCAPE)(PGPKey * _Nullable key))passphraseForKeyBlock decryptionError:(NSError * __autoreleasing _Nullable *)decryptionError verificationError:(NSError * __autoreleasing _Nullable *)verificationError; - /** Return list of key identifiers used in the given message. Determine keys that a message has been encrypted. diff --git a/ObjectivePGP.framework/Headers/PGPKeyGenerator.h b/ObjectivePGP.framework/Headers/PGPKeyGenerator.h index 45f443aaaf0b4bea1665d7621c8b54c0f5ab3565..cafd5e0a5f0a69588239d72b177802b017abc5b4 100644 --- a/ObjectivePGP.framework/Headers/PGPKeyGenerator.h +++ b/ObjectivePGP.framework/Headers/PGPKeyGenerator.h @@ -8,10 +8,11 @@ #import <Foundation/Foundation.h> #import <ObjectivePGP/PGPTypes.h> -#import <ObjectivePGP/PGPKey.h> NS_ASSUME_NONNULL_BEGIN +@class PGPKey; + NS_SWIFT_NAME(KeyGenerator) @interface PGPKeyGenerator : NSObject @property (nonatomic) int keyBitsLength; diff --git a/ObjectivePGP.framework/Headers/PGPPartialKey.h b/ObjectivePGP.framework/Headers/PGPPartialKey.h index 21990db7b408a0a2da776910ebca1da59a272c62..506fa90ce53a1fb1b44bba7127602291c4b315a1 100644 --- a/ObjectivePGP.framework/Headers/PGPPartialKey.h +++ b/ObjectivePGP.framework/Headers/PGPPartialKey.h @@ -27,7 +27,7 @@ NS_SWIFT_NAME(PartialKey) @interface PGPPartialKey : NSObject <PGPExportable, NS @property (nonatomic, readonly) PGPKeyType type; @property (nonatomic, copy) PGPPacket *primaryKeyPacket; @property (nonatomic, copy) NSArray<PGPUser *> *users; -@property (nonatomic, copy, nullable, readonly) PGPUser *primaryUser; // calculated +@property (nonatomic, copy, nullable, readonly) PGPUser *primaryUser; @property (nonatomic, copy, readonly) NSArray<PGPPartialSubKey *> *subKeys; @property (nonatomic, copy, readonly) NSArray<PGPSignaturePacket *> *directSignatures; @property (nonatomic, nullable, copy, readonly) PGPSignaturePacket *revocationSignature; diff --git a/ObjectivePGP.framework/Info.plist b/ObjectivePGP.framework/Info.plist index 39de5613232d667e6792fb58a8e8b29be36ba34b..273ab2447caa80149970b16c7a317fe37bab3042 100644 Binary files a/ObjectivePGP.framework/Info.plist and b/ObjectivePGP.framework/Info.plist differ diff --git a/ObjectivePGP.framework/ObjectivePGP b/ObjectivePGP.framework/ObjectivePGP index d055662492d5c48d881aa65eee82d996e9d6fc20..dd63de73c833ec41c1f0149c6ef8c425c5207d6c 100755 Binary files a/ObjectivePGP.framework/ObjectivePGP and b/ObjectivePGP.framework/ObjectivePGP differ diff --git a/ObjectivePGP.framework/PrivateHeaders/NSData+compression.h b/ObjectivePGP.framework/PrivateHeaders/NSData+compression.h index 603d080adcadbb9ff4844bbaff99b49884155c1e..04ad632710d9e88be49e5e8b69af262d02a9ad1e 100644 --- a/ObjectivePGP.framework/PrivateHeaders/NSData+compression.h +++ b/ObjectivePGP.framework/PrivateHeaders/NSData+compression.h @@ -4,6 +4,7 @@ // rfc1950 (zlib format) #import <Foundation/Foundation.h> +#import <ObjectivePGP/ObjectivePGP.h> NS_ASSUME_NONNULL_BEGIN diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPPartialKey+Private.h b/ObjectivePGP.framework/PrivateHeaders/PGPPartialKey+Private.h index 5474dda2d64ca97665c28262e4236b692aaff859..8d24ac66479bc2dc6e0ba08e5068dc4ac6377703 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPPartialKey+Private.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPPartialKey+Private.h @@ -6,7 +6,7 @@ // This notice may not be removed from this file. // -#import "PGPPartialKey.h" +#import <ObjectivePGP/ObjectivePGP.h> NS_ASSUME_NONNULL_BEGIN diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPPartialSubKey+Private.h b/ObjectivePGP.framework/PrivateHeaders/PGPPartialSubKey+Private.h index b1d2ded345b7f3f3b3f91122de6c05318cb62506..6e4ec3d25a01bc892094a15fda24d3d25c272326 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPPartialSubKey+Private.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPPartialSubKey+Private.h @@ -6,7 +6,7 @@ // This notice may not be removed from this file. // -#import "PGPPartialSubKey.h" +#import <ObjectivePGP/ObjectivePGP.h> @interface PGPPartialSubKey () diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket+Private.h b/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket+Private.h index abbcc0068eef1195803e42886af74f4d995860da..d6b2d35c6307eebf0aa50a06d17250b585a7cadd 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket+Private.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket+Private.h @@ -7,6 +7,7 @@ // #import "PGPPublicKeyPacket.h" +#import <ObjectivePGP/ObjectivePGP.h> NS_ASSUME_NONNULL_BEGIN diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket.h b/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket.h index 15d602b9f30b6829880cf8cca16d76e65921010e..c4b4ddaa3b3dc81a656e5e12f0a3699c551c7e32 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPPublicKeyPacket.h @@ -8,8 +8,7 @@ // Tag 6 #import "PGPPacketFactory.h" -#import "PGPFingerprint.h" -#import "PGPKeyID.h" +#import <ObjectivePGP/ObjectivePGP.h> #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN @@ -22,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) NSDate *createDate; @property (nonatomic, readonly) UInt16 V3validityPeriod; // obsolete @property (nonatomic, readonly) PGPPublicKeyAlgorithm publicKeyAlgorithm; -@property (nonatomic, readonly) BOOL isSupported; // generated properties @property (nonatomic, readonly) NSUInteger keySize; diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPSecretKeyPacket+Private.h b/ObjectivePGP.framework/PrivateHeaders/PGPSecretKeyPacket+Private.h index f27a442816909ae10474e6b3edb71697c8a213ff..f0768163b62e7f67ebc2f824a1723a91367e4451 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPSecretKeyPacket+Private.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPSecretKeyPacket+Private.h @@ -9,6 +9,7 @@ #import "PGPPublicKeyPacket+Private.h" #import "PGPS2K.h" #import "PGPSecretKeyPacket.h" +#import <ObjectivePGP/ObjectivePGP.h> NS_ASSUME_NONNULL_BEGIN diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPSignaturePacket+Private.h b/ObjectivePGP.framework/PrivateHeaders/PGPSignaturePacket+Private.h index dee6c23cbce97ae9d46b4a88c25e1ff282589645..9d0cf67c3049c7c954239bfa0c3d125f3ac287f3 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPSignaturePacket+Private.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPSignaturePacket+Private.h @@ -7,6 +7,7 @@ // #import "PGPSignaturePacket.h" +#import <ObjectivePGP/ObjectivePGP.h> NS_ASSUME_NONNULL_BEGIN diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPUser+Private.h b/ObjectivePGP.framework/PrivateHeaders/PGPUser+Private.h index f5868fded7ffa863e3cd50bfb1cc846a957bbdec..8ce5f5a5559258640f99c0d4a78e112e7b0dba8d 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPUser+Private.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPUser+Private.h @@ -5,10 +5,10 @@ // This notice may not be removed from this file. // -#import "PGPUser.h" -#import "PGPUserIDPacket.h" -#import "PGPUserAttributePacket.h" -#import "PGPSignaturePacket.h" +#import <ObjectivePGP/ObjectivePGP.h> +#import <ObjectivePGP/PGPUserIDPacket.h> +#import <ObjectivePGP/PGPUserAttributePacket.h> +#import <ObjectivePGP/PGPSignaturePacket.h> NS_ASSUME_NONNULL_BEGIN diff --git a/ObjectivePGP.framework/PrivateHeaders/PGPUserAttributeImageSubpacket.h b/ObjectivePGP.framework/PrivateHeaders/PGPUserAttributeImageSubpacket.h index dfd3e8a614632a38d44b31270480027c87f37082..3abe24d2480a38e348403ffcb60a00138c815b04 100644 --- a/ObjectivePGP.framework/PrivateHeaders/PGPUserAttributeImageSubpacket.h +++ b/ObjectivePGP.framework/PrivateHeaders/PGPUserAttributeImageSubpacket.h @@ -5,7 +5,7 @@ // This notice may not be removed from this file. // -#import "PGPUserAttributeSubpacket.h" +#import <ObjectivePGP/ObjectivePGP-Private.h> NS_ASSUME_NONNULL_BEGIN diff --git a/ObjectivePGP.framework/README.md b/ObjectivePGP.framework/README.md index 074ab3e1fdb2c58be2abebcac7d5b4d92982f15d..959a92ce1c8943de085fe34a33a76eccde8b7651 100644 --- a/ObjectivePGP.framework/README.md +++ b/ObjectivePGP.framework/README.md @@ -17,7 +17,7 @@ You want to help, great! Go ahead and fork our repo, make your changes and send ## Contribution You are welcome to contribute. See [CONTRIBUTING.md](https://github.com/krzyzanowskim/ObjectivePGP/blob/master/CONTRIBUTING.md) -Please create [Pull Request](https://github.com/krzyzanowskim/ObjectivePGP/pulls). +Please create [Pull Request](https://github.com/krzyzanowskim/ObjectivePGP/pulls) against `develop` branch. ## The license diff --git a/enzevalos_iphone/DataHandler.swift b/enzevalos_iphone/DataHandler.swift index 0c0af189cdb1f053c047f2792343cd0f95db43b0..11069fc9db5f6a4f218442c5f82b25d26287af3f 100644 --- a/enzevalos_iphone/DataHandler.swift +++ b/enzevalos_iphone/DataHandler.swift @@ -1033,7 +1033,12 @@ class DataHandler { func getAllKeyRecords() -> [KeyRecord] { var result: [KeyRecord] = [] if let records = findAll("KeyRecord") as? [KeyRecord] { - result = records + result = records.filter{ + if let mails = $0.persistentMails { + return mails.count != 0 + } + return false + } } return result }