pEp.foundation
/
pEpObjCAdapter
11
1
Fork 2
Code Issues Releases Wiki Activity

E3-3 Remove the trustwords method that can't be supported anymore

engine3/E3-3
Dirk Zimmermann 2023-02-10 09:07:47 +01:00
parent 01e6892d94
commit dfaa61884d
4 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Subprojects/PEPObjCAdapterProtocols/PublicHeaders/PEPSessionProtocol.h
View File

@ -130,13 +130,6 @@ extern NSString *const _Nonnull PEPObjCAdapterErrorDomain;
errorCallback:(void (^)(NSError *error))errorCallback
successCallback:(void (^)(NSString *trustwords))successCallback;
- (void)getTrustwordsFpr1:(NSString *)fpr1
fpr2:(NSString *)fpr2
language:(NSString *_Nullable)language
full:(BOOL)full
errorCallback:(void (^)(NSError *error))errorCallback
successCallback:(void (^)(NSString *trustwords))successCallback;
- (void)languageList:(void (^)(NSError *error))errorCallback
successCallback:(void (^)(NSArray<PEPLanguage *> *languages))successCallback;

7
src/PEPInternalSession.h
View File

@ -195,13 +195,6 @@ NS_ASSUME_NONNULL_BEGIN
full:(BOOL)full
error:(NSError * _Nullable * _Nullable)error;
/** Determine trustwords for two fprs */
- (NSString * _Nullable)getTrustwordsFpr1:(NSString *)fpr1
fpr2:(NSString *)fpr2
language:(NSString * _Nullable)language
full:(BOOL)full
error:(NSError * _Nullable * _Nullable)error;
/**
@returns The list of supported languages for trustwords.
*/

28
src/PEPInternalSession.m
View File

@ -663,34 +663,6 @@ void decryptMessageFree(message *src, message *dst, stringlist_t *extraKeys)
return result;
}
- (NSString * _Nullable)getTrustwordsFpr1:(NSString * _Nonnull)fpr1
fpr2:(NSString * _Nonnull)fpr2
language:(NSString * _Nullable)language
full:(BOOL)full
error:(NSError * _Nullable * _Nullable)error
{
const char *_fpr1 = [fpr1 UTF8String]; // fprs are NFC normalized anyway
const char *_fpr2 = [fpr2 UTF8String];
PEPAutoPointer *trustwords = [PEPAutoPointer new];
__block size_t sizeWritten = 0;
PEPStatus status = (PEPStatus) [self runWithPasswords:^PEP_STATUS(PEP_SESSION session) {
return get_xor_trustwords_for_fprs(session, _fpr1, _fpr2,
[[language precomposedStringWithCanonicalMapping]
UTF8String],
trustwords.charPointerPointer, &sizeWritten, full);
}];
NSString *result = nil;
if (![PEPStatusNSErrorUtil setError:error fromPEPStatus:status]) {
result = [NSString stringWithUTF8String:trustwords.charPointer];
}
return result;
}
- (NSArray<PEPLanguage *> * _Nullable)languageListWithError:(NSError * _Nullable * _Nullable)error
{
PEPAutoPointer *chLangs = [PEPAutoPointer new];

22
src/PEPSession.m
View File

@ -411,28 +411,6 @@ successCallback:(void (^)(NSString *log))successCallback
});
}
- (void)getTrustwordsFpr1:(NSString *)fpr1
fpr2:(NSString *)fpr2
language:(NSString * _Nullable)language
full:(BOOL)full
errorCallback:(void (^)(NSError *error))errorCallback
successCallback:(void (^)(NSString *trustwords))successCallback
{
dispatch_async(queue, ^{
NSError *error = nil;
NSString *trustwords = [[PEPSessionProvider session] getTrustwordsFpr1:fpr1
fpr2:fpr2
language:language
full:full
error:&error];
if (trustwords) {
successCallback(trustwords);
} else {
errorCallback(error);
}
});
}
- (void)languageList:(void (^)(NSError *error))errorCallback
successCallback:(void (^)(NSArray<PEPLanguage *> *languages))successCallback