IOS-714 NSDictionary.commType

pEpObjCAdapter/NSDictionary+Extension.h

@@ -8,8 +8,16 @@
 
 #import <Foundation/Foundation.h>
 
+#import "pEpEngine.h"
+
 @interface NSDictionary (Extension)
 
+/**
+ If we interpret the self as a dictionary denoting a p≡p Identity,
+ does the comm type denote a PGP user?
+ */
+@property (nonatomic, readonly) PEP_comm_type commType;
+
 /**
  If we interpret the self as a dictionary denoting a p≡p Identity,
  does the comm type denote a PGP user?

pEpObjCAdapter/NSDictionary+Extension.m

@@ -14,12 +14,32 @@
 
 @implementation NSDictionary (Extension)
 
+- (PEP_comm_type)commType
+{
+    NSNumber *ctNum = self[kPepCommType];
+    if (!ctNum) {
+        return PEP_ct_unknown;
+    }
+    return ctNum.intValue;
+}
+
+- (BOOL)containsPGPCommType
+{
+    PEP_comm_type val = self.commType;
+
+    return
+    val == PEP_ct_OpenPGP_weak_unconfirmed ||
+    val == PEP_ct_OpenPGP_unconfirmed ||
+    val == PEP_ct_OpenPGP_weak ||
+    val == PEP_ct_OpenPGP;
+}
+
 - (void)debugSaveToFilePath:(NSString * _Nonnull)filePath
 {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSURL *parentPath = [[fileManager
-                       URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask]
-                      firstObject];
+                          URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask]
+                         firstObject];
 
     NSDate *now = [NSDate date];
     NSString *nowDesc = [now description];
@@ -31,19 +51,4 @@
     [self writeToURL:writeURL atomically:YES];
 }
 
-- (BOOL)containsPGPCommType
-{
-    NSNumber *ctNum = self[kPepCommType];
-    if (!ctNum) {
-        return NO;
-    }
-    NSInteger val = ctNum.integerValue;
-
-    return
-    val == PEP_ct_OpenPGP_weak_unconfirmed ||
-    val == PEP_ct_OpenPGP_unconfirmed ||
-    val == PEP_ct_OpenPGP_weak ||
-    val == PEP_ct_OpenPGP;
-}
-
 @end