IOSAD-180 Make the passphrase cache own itself

pEpObjCAdapter/PEPInternalSession.h

@@ -38,10 +38,7 @@
  */
 - (void)configUnEncryptedSubjectEnabled:(BOOL)enabled;
 
-/// Get the (global) passphrase cache
+/// Get the (global) passphrase cache, convenience method.
 - (PEPPassphraseCache * _Nonnull)passphraseCache;
 
-/// Get the (global) passphrase cache
-+ (PEPPassphraseCache * _Nonnull)passphraseCache;
-
 @end

pEpObjCAdapter/PEPInternalSession.m

@@ -33,8 +33,6 @@
 
 #import "key_reset.h"
 
-PEPPassphraseCache * _Nullable g_passphraseCache;
-
 @implementation PEPInternalSession
 
 - (_Nullable instancetype)init
@@ -1164,17 +1162,7 @@ static NSDictionary *stringToRating;
 
 - (PEPPassphraseCache * _Nonnull)passphraseCache
 {
-    return [PEPInternalSession passphraseCache];
-}
-
-+ (PEPPassphraseCache * _Nonnull)passphraseCache
-{
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        g_passphraseCache = [[PEPPassphraseCache alloc] init];
-    });
-
-    return g_passphraseCache;
+    return [PEPPassphraseCache passphraseCache];
 }
 
 @end

pEpObjCAdapter/PEPObjCAdapter.m

@@ -72,7 +72,7 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
 {
     if (passphrase == nil) {
         s_passphraseForNewKeys = nil;
-        [[PEPInternalSession passphraseCache] setStoredPassphrase:passphrase];
+        [[PEPPassphraseCache passphraseCache] setStoredPassphrase:passphrase];
 
         return YES;
     } else {
@@ -83,7 +83,7 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
         }
 
         s_passphraseForNewKeys = normalizedPassphrase;
-        [[PEPInternalSession passphraseCache] setStoredPassphrase:passphrase];
+        [[PEPPassphraseCache passphraseCache] setStoredPassphrase:passphrase];
 
         return YES;
     }

pEpObjCAdapter/PEPPassphraseCache.h

@@ -32,6 +32,9 @@ extern const NSUInteger PEPPassphraseCacheMaxNumberOfPassphrases;
 /// should be reset.
 - (void)resetTimeoutForPassphrase:(NSString *)passphrase;
 
+/// Get the (global) passphrase cache
++ (PEPPassphraseCache * _Nonnull)passphraseCache;
+
 @end
 
 NS_ASSUME_NONNULL_END

pEpObjCAdapter/PEPPassphraseCache.m

@@ -17,6 +17,8 @@ const NSUInteger PEPPassphraseCacheMaxNumberOfPassphrases = 20;
 static NSTimeInterval s_defaultTimeoutInSeconds = 10 * 60;
 static NSTimeInterval s_defaultCheckExpiryInterval = 60;
 
+PEPPassphraseCache * _Nullable g_passphraseCache;
+
 /// Extension for internals
 @interface PEPPassphraseCache ()
 
@@ -156,6 +158,16 @@ static NSTimeInterval s_defaultCheckExpiryInterval = 60;
     [self.mutablePassphraseEntries addObjectsFromArray:resultingPassphrases];
 }
 
++ (PEPPassphraseCache * _Nonnull)passphraseCache
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        g_passphraseCache = [[PEPPassphraseCache alloc] init];
+    });
+
+    return g_passphraseCache;
+}
+
 #pragma mark - Helpers
 
 - (BOOL)isExpiredPassphraseEntry:(PEPPassphraseCacheEntry *)passphraseEntry