IOSAD-157 Roll back some changes IOSAD-157
authorDirk Zimmermann <dz@pep.security>
Wed, 20 Nov 2019 16:39:59 +0100
branchIOSAD-157
changeset 13509909969de797
parent 1349 579234097a35
child 1351 292758143715
IOSAD-157 Roll back some changes
pEpObjCAdapter/PEPInternalSession.m
pEpObjCAdapter/PEPSession.m
pEpObjCAdapter/PEPSync_Internal.h
pEpObjCAdapterFramework/PEPSessionProtocol.h
     1.1 --- a/pEpObjCAdapter/PEPInternalSession.m	Wed Nov 20 09:10:05 2019 +0100
     1.2 +++ b/pEpObjCAdapter/PEPInternalSession.m	Wed Nov 20 16:39:59 2019 +0100
     1.3 @@ -24,7 +24,6 @@
     1.4  #import "PEPAutoPointer.h"
     1.5  #import "NSNumber+PEPRating.h"
     1.6  #import "NSMutableDictionary+PEP.h"
     1.7 -#import "PEPSync.h"
     1.8  #import "PEPSync_Internal.h" // for [PEPSync createSession:]
     1.9  #import "PEPInternalConstants.h"
    1.10  
    1.11 @@ -78,11 +77,6 @@
    1.12  
    1.13  #pragma mark - PEPSessionProtocol
    1.14  
    1.15 -- (BOOL)isKeySyncEnabled
    1.16 -{
    1.17 -    return g_isKeySyncEnabled;
    1.18 -}
    1.19 -
    1.20  void decryptMessageDictFree(message *src, message *dst, stringlist_t *extraKeys)
    1.21  {
    1.22      free_message(src);
     2.1 --- a/pEpObjCAdapter/PEPSession.m	Wed Nov 20 09:10:05 2019 +0100
     2.2 +++ b/pEpObjCAdapter/PEPSession.m	Wed Nov 20 16:39:59 2019 +0100
     2.3 @@ -41,15 +41,6 @@
     2.4      [PEPSessionProvider cleanup];
     2.5  }
     2.6  
     2.7 -- (BOOL)isKeySyncEnabled
     2.8 -{
     2.9 -    PEPInternalSession *session = [PEPSessionProvider session];
    2.10 -    if (session == nil) {
    2.11 -        return NO;
    2.12 -    }
    2.13 -    return session.isKeySyncEnabled;
    2.14 -}
    2.15 -
    2.16  - (PEPMessage * _Nullable)decryptMessage:(PEPMessage * _Nonnull)message
    2.17                                     flags:(PEPDecryptFlags * _Nullable)flags
    2.18                                    rating:(PEPRating * _Nullable)rating
     3.1 --- a/pEpObjCAdapter/PEPSync_Internal.h	Wed Nov 20 09:10:05 2019 +0100
     3.2 +++ b/pEpObjCAdapter/PEPSync_Internal.h	Wed Nov 20 16:39:59 2019 +0100
     3.3 @@ -9,13 +9,10 @@
     3.4  #ifndef PEPSync_Internal_h
     3.5  #define PEPSync_Internal_h
     3.6  
     3.7 -/// Is pEp sync running or not?
     3.8 -extern BOOL g_isKeySyncEnabled;
     3.9 -
    3.10  /**
    3.11   Internal methods of PEPSync.
    3.12   */
    3.13 -@interface PEPSync()
    3.14 +@interface PEPSync : NSObject
    3.15  
    3.16  /**
    3.17   Creates an engine session (PEP_SESSION).
     4.1 --- a/pEpObjCAdapterFramework/PEPSessionProtocol.h	Wed Nov 20 09:10:05 2019 +0100
     4.2 +++ b/pEpObjCAdapterFramework/PEPSessionProtocol.h	Wed Nov 20 16:39:59 2019 +0100
     4.3 @@ -17,9 +17,6 @@
     4.4  
     4.5  @protocol PEPSessionProtocol <NSObject>
     4.6  
     4.7 -/// Boolean for whether pEp sync is enabled (running) or not.
     4.8 -- (BOOL)isKeySyncEnabled;
     4.9 -
    4.10  /** Decrypt a message */
    4.11  - (PEPMessage * _Nullable)decryptMessage:(PEPMessage * _Nonnull)message
    4.12                                     flags:(PEPDecryptFlags * _Nullable)flags