Skip to content

Commit

Permalink
refactor(ios): remove deprecated properties on stream callbacks
Browse files Browse the repository at this point in the history 
    This removes the errorState and errorDescription properties that have been deprecated since sdk
    3.0.0

    BREAKING CHANGE: Removes deprecated stream callback properties
  • Loading branch information
@sgtcoolguy
sgtcoolguy committed Dec 9, 2019
1 parent 4b48db8 commit f4de7a9
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 54 deletions.
1 change: 0 additions & 1 deletion iphone/Classes/StreamModule.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ - (void)invokeRWOperation:(SEL)operation withArgs:(id)args
[event setObject:stream forKey:@"source"];
}
[event setObject:NUMINT(-1) forKey:@"bytesProcessed"];
[event setObject:errorStr forKey:@"errorDescription"];
[self _fireEventToListener:@"io" withObject:event listener:callback thisObject:nil];
return;
}
Expand Down
22 changes: 0 additions & 22 deletions iphone/Classes/TiDataStream.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ - (NSInteger)readToBuffer:(TiBuffer *)toBuffer offset:(NSInteger)offset length:(
if (callback != nil) {
NSMutableDictionary *event = [TiUtils dictionaryWithCode:-1 message:errorMessage];
[event setObject:NUMINT(0) forKey:@"bytesProcessed"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[event setObject:errorMessage forKey:@"errorDescription"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:nil];
}
return 0;
Expand All @@ -57,8 +55,6 @@ - (NSInteger)readToBuffer:(TiBuffer *)toBuffer offset:(NSInteger)offset length:(
if (callback != nil) {
NSMutableDictionary *event = [TiUtils dictionaryWithCode:-1 message:nil];
[event setObject:NUMINT(-1) forKey:@"bytesProcessed"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:nil];
}
return -1;
Expand All @@ -81,8 +77,6 @@ - (NSInteger)readToBuffer:(TiBuffer *)toBuffer offset:(NSInteger)offset length:(
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:self forKey:@"source"];
[event setObject:NUMUINTEGER(bytesToWrite) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:nil];
}

Expand All @@ -106,8 +100,6 @@ - (NSInteger)writeFromBuffer:(TiBuffer *)fromBuffer offset:(NSInteger)offset len
NSMutableDictionary *event = [TiUtils dictionaryWithCode:-1 message:errorStr];
[event setObject:self forKey:@"source"];
[event setObject:NUMINT(-1) forKey:@"bytesProcessed"];
[event setObject:errorStr forKey:@"errorDescription"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[self _fireEventToListener:@"write" withObject:event listener:callback thisObject:nil];
}
return -1;
Expand All @@ -119,8 +111,6 @@ - (NSInteger)writeFromBuffer:(TiBuffer *)fromBuffer offset:(NSInteger)offset len
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:self forKey:@"source"];
[event setObject:NUMINT(0) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"write" withObject:event listener:callback thisObject:nil];
}
return 0;
Expand Down Expand Up @@ -149,8 +139,6 @@ - (NSInteger)writeFromBuffer:(TiBuffer *)fromBuffer offset:(NSInteger)offset len
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:self forKey:@"source"];
[event setObject:NUMUINTEGER(length) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"write" withObject:event listener:callback thisObject:nil];
}

Expand Down Expand Up @@ -193,8 +181,6 @@ - (NSInteger)writeToStream:(id<TiStreamInternal>)output chunkSize:(NSInteger)siz
[event setObject:self forKey:@"fromStream"];
[event setObject:output forKey:@"toStream"];
[event setObject:NUMUINTEGER(totalBytes) forKey:@"bytesWritten"];
[event setObject:[e reason] forKey:@"errorDescription"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[self _fireEventToListener:@"writeToStream" withObject:event listener:callback thisObject:nil];
} else {
@throw e;
Expand All @@ -213,8 +199,6 @@ - (NSInteger)writeToStream:(id<TiStreamInternal>)output chunkSize:(NSInteger)siz
[event setObject:self forKey:@"fromStream"];
[event setObject:output forKey:@"toStream"];
[event setObject:NUMUINTEGER(totalBytes) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"writeToStream" withObject:event listener:callback thisObject:nil];
}

Expand Down Expand Up @@ -246,8 +230,6 @@ - (void)pumpToCallback:(KrollCallback *)callback chunkSize:(NSInteger)size async
[event setObject:[NSNull null] forKey:@"buffer"];
[event setObject:NUMINT(-1) forKey:@"bytesProcessed"];
[event setObject:NUMUINTEGER(totalBytes) forKey:@"totalBytesProcessed"];
[event setObject:NUMINT(1) forKey:@"errorState"];
[event setObject:message forKey:@"errorDescription"];
[self _fireEventToListener:@"pump" withObject:event listener:callback thisObject:nil];
break;
}
Expand All @@ -262,8 +244,6 @@ - (void)pumpToCallback:(KrollCallback *)callback chunkSize:(NSInteger)size async
[event setObject:tempBuffer forKey:@"buffer"];
[event setObject:NUMUINTEGER(bytesToWrite) forKey:@"bytesProcessed"];
[event setObject:NUMUINTEGER(totalBytes) forKey:@"totalBytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"pump" withObject:event listener:callback thisObject:nil];
}

Expand All @@ -273,8 +253,6 @@ - (void)pumpToCallback:(KrollCallback *)callback chunkSize:(NSInteger)size async
[event setObject:[NSNull null] forKey:@"buffer"];
[event setObject:NUMINT(-1) forKey:@"bytesProcessed"];
[event setObject:NUMUINTEGER(totalBytes) forKey:@"totalBytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"pump" withObject:event listener:callback thisObject:nil];
}

Expand Down
14 changes: 1 addition & 13 deletions iphone/Classes/TiNetworkSocketTCPProxy.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ - (NSInteger)readToBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:(NS
int tag = -1;
if (callback != nil) {
tag = asynchTagCount;
NSDictionary *asynchInfo = [NSDictionary dictionaryWithObjectsAndKeys:buffer, @"buffer", callback, @"callback", NUMINT(TO_BUFFER), @"type", NUMINT(0), @"errorState", @"", @"errorDescription", nil];
NSDictionary *asynchInfo = [NSDictionary dictionaryWithObjectsAndKeys:buffer, @"buffer", callback, @"callback", NUMINT(TO_BUFFER), @"type", nil];
[operationInfo setObject:asynchInfo forKey:NUMINT(tag)];
asynchTagCount = (asynchTagCount + 1) % INT_MAX;
}
Expand All @@ -498,8 +498,6 @@ - (NSInteger)writeFromBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:self forKey:@"source"];
[event setObject:NUMINT(0) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"write" withObject:event listener:callback thisObject:nil];
}
return 0;
Expand Down Expand Up @@ -715,8 +713,6 @@ - (BOOL)onSocket:(AsyncSocket *)sock shouldDisconnectWithError:(NSError *)err
KrollCallback *callback = [info valueForKey:@"callback"];
NSString *message = [TiUtils messageFromError:err];
NSMutableDictionary *event = [TiUtils dictionaryWithCode:[err code] message:message];
[event setObject:NUMINTEGER([err code]) forKey:@"errorState"];
[event setObject:message forKey:@"errorDescription"];
[self _fireEventToListener:@"error" withObject:event listener:callback thisObject:nil];
}

Expand All @@ -736,8 +732,6 @@ - (BOOL)onSocket:(AsyncSocket *)sock shouldDisconnectWithError:(NSError *)err
KrollCallback *callback = [info valueForKey:@"callback"];
ReadDestination type = [[info objectForKey:@"type"] intValue];
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[event setObject:NUMINT(-1) forKey:@"bytesProcessed"];
NSString *name = nil;

Expand Down Expand Up @@ -790,8 +784,6 @@ - (void)onSocket:(AsyncSocket *)sock didWriteDataWithTag:(long)tag
KrollCallback *callback = [info valueForKey:@"callback"];
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:[info valueForKey:@"bytesProcessed"] forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"write" withObject:event listener:callback thisObject:self];
[operationInfo removeObjectForKey:NUMLONG(tag)];
} else {
Expand Down Expand Up @@ -820,8 +812,6 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)ta
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:buffer forKey:@"buffer"];
[event setObject:NUMUINTEGER([data length]) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:self];
break;
}
Expand Down Expand Up @@ -856,8 +846,6 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)ta
[event setObject:tempBuffer forKey:@"buffer"];
[event setObject:NUMUINTEGER([data length]) forKey:@"bytesProcessed"];
[event setObject:NUMUINTEGER(readDataLength) forKey:@"totalBytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"pump" withObject:event listener:callback thisObject:nil];

// ... And queue up the next pump.
Expand Down
18 changes: 0 additions & 18 deletions iphone/TitaniumKit/TitaniumKit/Sources/Modules/TiFilesystemFileStreamProxy.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ - (NSInteger)readToBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:(NS
if (callback != nil) {
NSMutableDictionary *event = [TiUtils dictionaryWithCode:-1 message:errorMessage];
[event setObject:NUMINT(0) forKey:@"bytesProcessed"];
[event setObject:errorMessage forKey:@"errorMessage"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:nil];
}
return 0;
Expand All @@ -142,8 +140,6 @@ - (NSInteger)readToBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:(NS
if (callback != nil) {
NSMutableDictionary *event = [TiUtils dictionaryWithCode:-1 message:nil];
[event setObject:NUMINT(-1) forKey:@"bytesProcessed"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:nil];
}
return -1;
Expand All @@ -154,8 +150,6 @@ - (NSInteger)readToBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:(NS
if (callback != nil) {
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:[buffer length] forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:nil];
}
return [[buffer length] integerValue];
Expand All @@ -181,8 +175,6 @@ - (NSInteger)readToBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:(NS
if (callback != nil) {
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:NUMUINTEGER([fileData length]) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"read" withObject:event listener:callback thisObject:nil];
}
return [fileData length];
Expand Down Expand Up @@ -211,8 +203,6 @@ - (NSInteger)writeFromBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:
NSMutableDictionary *event = [TiUtils dictionaryWithCode:0 message:nil];
[event setObject:self forKey:@"source"];
[event setObject:NUMUINTEGER([slicedData length]) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"write" withObject:event listener:callback thisObject:nil];
}
}
Expand All @@ -221,8 +211,6 @@ - (NSInteger)writeFromBuffer:(TiBuffer *)buffer offset:(NSInteger)offset length:
NSMutableDictionary *event = [TiUtils dictionaryWithCode:-1 message:[e reason]];
[event setObject:self forKey:@"source"];
[event setObject:NUMINT(0) forKey:@"bytesProcessed"];
[event setObject:[e reason] forKey:@"errorDescription"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[self _fireEventToListener:@"write" withObject:event listener:callback thisObject:nil];
} else {
@throw e;
Expand Down Expand Up @@ -270,8 +258,6 @@ - (NSInteger)writeToStream:(id<TiStreamInternal>)output chunkSize:(NSInteger)siz
[event setObject:self forKey:@"fromStream"];
[event setObject:output forKey:@"toStream"];
[event setObject:NUMUINTEGER(bytesWritten) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"writeToStream" withObject:event listener:callback thisObject:nil];
}
} else {
Expand All @@ -285,8 +271,6 @@ - (NSInteger)writeToStream:(id<TiStreamInternal>)output chunkSize:(NSInteger)siz
[event setObject:self forKey:@"fromStream"];
[event setObject:output forKey:@"toStream"];
[event setObject:NUMINT(0) forKey:@"bytesProcessed"];
[event setObject:[e reason] forKey:@"errorDescription"];
[event setObject:NUMINT(-1) forKey:@"errorState"];
[self _fireEventToListener:@"writeToStream" withObject:event listener:callback thisObject:nil];
} else {
@throw e;
Expand All @@ -308,8 +292,6 @@ - (NSInteger)writeToStream:(id<TiStreamInternal>)output chunkSize:(NSInteger)siz
[event setObject:self forKey:@"fromStream"];
[event setObject:output forKey:@"toStream"];
[event setObject:NUMUINTEGER(totalBytes) forKey:@"bytesProcessed"];
[event setObject:NUMINT(0) forKey:@"errorState"];
[event setObject:@"" forKey:@"errorDescription"];
[self _fireEventToListener:@"writeToStream" withObject:event listener:callback thisObject:nil];
}

Expand Down

0 comments on commit f4de7a9

Please sign in to comment.