oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

This commit is contained in:
Matthew Chen 2018-09-18 16:44:31 -04:00
parent e8eac9f30b
commit 4ad7ca79b7
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SignalServiceKit/src/Devices/OWSDevice.m
View File

@ -117,6 +117,7 @@ NSString *const kOWSPrimaryStorage_MayHaveLinkedDevices = @"kTSStorageManager_Ma
OWSDevice *device = [MTLJSONAdapter modelOfClass:[self class] fromJSONDictionary:deviceAttributes error:error];
if (device.deviceId < OWSDevicePrimaryDeviceId) {
OWSFailDebug(@"Invalid device id: %lu", (unsigned long)device.deviceId);
*error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecodeJson, @"Invalid device id.");
return nil;
}
return device;
@ -181,7 +182,7 @@ NSString *const kOWSPrimaryStorage_MayHaveLinkedDevices = @"kTSStorageManager_Ma
}
*success = NO;
OWSLogError(@"unable to decode date from %@", value);
*error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecodeJson, @"Unable to decode date from %@");
*error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecodeJson, @"Unable to decode date from JSON.");
return nil;
}
reverseBlock:^id(id value, BOOL *success, NSError **error) {
@ -194,7 +195,7 @@ NSString *const kOWSPrimaryStorage_MayHaveLinkedDevices = @"kTSStorageManager_Ma
}
}
OWSLogError(@"unable to encode date from %@", value);
*error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToEncodeJson, @"Unable to encode date");
*error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToEncodeJson, @"Unable to encode date to JSON.");
*success = NO;
return nil;
}];

4
SignalServiceKit/src/Devices/OWSProvisioningCipher.m
View File

@ -54,6 +54,10 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable NSData *)encrypt:(NSData *)dataToEncrypt
{
@try {
// Exceptions can be thrown in a number of places in encryptUnsafe, e.g.:
//
// * Curve25519's generateSharedSecretFromPublicKey.
// * [HKDFKit deriveKey].
return [self encryptUnsafe:dataToEncrypt];
} @catch (NSException *exception) {
OWSFailDebug(@"exception: %@ of type: %@ with reason: %@, user info: %@.",

6
SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m
View File

@ -54,15 +54,15 @@ NS_ASSUME_NONNULL_BEGIN
+ (nullable TSAttachmentPointer *)attachmentPointerFromProto:(SSKProtoAttachmentPointer *)attachmentProto
{
if (attachmentProto.id < 1) {
OWSFailDebug("Invalid attachment id.");
OWSFailDebug(@"Invalid attachment id.");
return nil;
}
if (attachmentProto.key.length < 1) {
OWSFailDebug("Invalid attachment key.");
OWSFailDebug(@"Invalid attachment key.");
return nil;
}
if (attachmentProto.contentType.length < 1) {
OWSFailDebug("Invalid attachment content type.");
OWSFailDebug(@"Invalid attachment content type.");
return nil;
}

2
SignalServiceKit/src/Messages/OWSMessageManager.m
View File

@ -1174,7 +1174,7 @@ NS_ASSUME_NONNULL_BEGIN
}
case SSKProtoGroupContextTypeQuit: {
if (!oldGroupThread) {
OWSFailDebug(@"ignoring quit group message from unknown group.");
OWSLogWarn(@"ignoring quit group message from unknown group.");
return nil;
}
[newMemberIds removeObject:envelope.source];

2
SignalServiceKit/src/Util/NSData+OWS.m
View File

@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
for (NSData *data in datas) {
[result appendData:data];
}
return result;
return [result copy];
}
- (NSData *)dataByAppendingData:(NSData *)data