mirror of https://github.com/oxen-io/session-ios
Merge branch 'charlesmchen/removeObjcProtos'
Matthew Chen
6 years ago
commit
c94c33d612
@ -1 +1 @@
|
||||
Subproject commit b9d00f47530c6c0c219b6c8cfe1802216f3093b9
|
||||
Subproject commit 5da11dee08c2cc8864ea03b1489bd8898d28dd4e
|
||||
@ -1,35 +1,82 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSChunkedOutputStream.h"
|
||||
#import <ProtocolBuffers/CodedOutputStream.h>
|
||||
#import "NSData+OWS.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSChunkedOutputStream ()
|
||||
|
||||
@property (nonatomic, readonly) NSOutputStream *outputStream;
|
||||
@property (nonatomic) BOOL hasError;
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark -
|
||||
|
||||
@implementation OWSChunkedOutputStream
|
||||
|
||||
+ (instancetype)streamWithOutputStream:(NSOutputStream *)output
|
||||
- (instancetype)initWithOutputStream:(NSOutputStream *)outputStream
|
||||
{
|
||||
return [[self alloc] initWithOutputStream:output];
|
||||
if (self = [super init]) {
|
||||
OWSAssert(outputStream);
|
||||
_outputStream = outputStream;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithOutputStream:(NSOutputStream *)outputStream
|
||||
- (BOOL)writeByte:(uint8_t)value
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
NSInteger written = [self.outputStream write:&value maxLength:sizeof(value)];
|
||||
if (written != sizeof(value)) {
|
||||
OWSFail(@"%@ could not write to output stream.", self.logTag);
|
||||
self.hasError = YES;
|
||||
return NO;
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
|
||||
_delegateStream = [PBCodedOutputStream streamWithOutputStream:outputStream];
|
||||
- (BOOL)writeData:(NSData *)data
|
||||
{
|
||||
OWSAssert(data);
|
||||
|
||||
return self;
|
||||
if (data.length < 1) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
while (YES) {
|
||||
NSInteger written = [self.outputStream write:data.bytes maxLength:data.length];
|
||||
if (written < 1) {
|
||||
OWSFail(@"%@ could not write to output stream.", self.logTag);
|
||||
self.hasError = YES;
|
||||
return NO;
|
||||
}
|
||||
if (written < data.length) {
|
||||
data = [data subdataWithRange:NSMakeRange(written, data.length - written)];
|
||||
} else {
|
||||
return YES;
|
||||
}
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (void)flush
|
||||
- (BOOL)writeVariableLengthUInt32:(UInt32)value
|
||||
{
|
||||
[self.delegateStream flush];
|
||||
while (YES) {
|
||||
if (value <= 0x7F) {
|
||||
return [self writeByte:value];
|
||||
} else {
|
||||
if (![self writeByte:((value & 0x7F) | 0x80)]) {
|
||||
return NO;
|
||||
}
|
||||
value >>= 7;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
Loading…
Reference in New Issue