IOSAD-103 Merge in default. IOSAD-103
authorDirk Zimmermann <dz@pep.security>
Mon, 11 Feb 2019 09:32:38 +0100
branchIOSAD-103
changeset 7802af66006a06b
parent 778 4d79e043e1e1
parent 779 5a12e7591faa
child 781 dc111a7cdd43
IOSAD-103 Merge in default.
pEpObjCAdapter/NSError+PEP.m
     1.1 --- a/pEpObjCAdapter/NSError+PEP.m	Fri Feb 08 15:54:10 2019 +0100
     1.2 +++ b/pEpObjCAdapter/NSError+PEP.m	Mon Feb 11 09:32:38 2019 +0100
     1.3 @@ -134,15 +134,15 @@
     1.4          case PEP_UNKNOWN_DB_ERROR: return @"PEP_UNKNOWN_DB_ERROR";
     1.5          case PEP_MALFORMED_KEY_RESET_MSG: return @"PEP_MALFORMED_KEY_RESET_MSG";
     1.6          case PEP_KEY_NOT_RESET: return @"PEP_KEY_NOT_RESET";
     1.7 +        case PEP_KEY_IMPORTED: return @"PEP_KEY_IMPORTED";
     1.8 +        case PEP_NO_KEY_IMPORTED: return @"PEP_NO_KEY_IMPORTED";
     1.9 +        case PEP_KEY_IMPORT_STATUS_UNKNOWN: return @"PEP_KEY_IMPORT_STATUS_UNKNOWN";
    1.10          case PEP_SYNC_NO_CHANNEL: return @"PEP_SYNC_NO_CHANNEL";
    1.11          case PEP_SYNC_CANNOT_ENCRYPT: return @"PEP_SYNC_CANNOT_ENCRYPT";
    1.12          case PEP_SYNC_NO_MESSAGE_SEND_CALLBACK: return @"PEP_SYNC_NO_MESSAGE_SEND_CALLBACK";
    1.13          case PEP_STATEMACHINE_ERROR: return @"PEP_STATEMACHINE_ERROR";
    1.14          case PEP_NO_TRUST: return @"PEP_NO_TRUST";
    1.15          case PEP_STATEMACHINE_CANNOT_SEND: return @"PEP_STATEMACHINE_CANNOT_SEND";
    1.16 -        case PEP_KEY_IMPORTED: return @"PEP_KEY_IMPORTED";
    1.17 -        case PEP_NO_KEY_IMPORTED: return @"PEP_NO_KEY_IMPORTED";
    1.18 -        case PEP_KEY_IMPORT_STATUS_UNKNOWN: return @"PEP_KEY_IMPORT_STATUS_UNKNOWN";
    1.19      }
    1.20  }
    1.21