IRCConnection: Make fallback encoding configurable

FossilOrigin-Name: 0ca6e4f04d891d2bcc17cacb15ad6e17090624bf65efed09999a26e9c9998192
This commit is contained in:
Jonathan Schleifer 2017-01-22 20:49:44 +00:00
parent 21784a8d30
commit 0dd8cdc46a
2 changed files with 14 additions and 9 deletions

View file

@ -42,6 +42,7 @@
@synthesize server = _server, port = _port;
@synthesize nickname = _nickname, username = _username, realname = _realname;
@synthesize delegate = _delegate, socket = _socket;
@synthesize fallbackEncoding = _fallbackEncoding;
+ (instancetype)connection
{
@ -56,6 +57,7 @@
_socketClass = [OFTCPSocket class];
_channels = [[OFMutableDictionary alloc] init];
_port = 6667;
_fallbackEncoding = OF_STRING_ENCODING_ISO_8859_1;
} @catch (id e) {
[self release];
@throw e;
@ -534,9 +536,9 @@
objc_autoreleasePoolPop(pool);
}
- (bool)socket: (OFTCPSocket*)socket
didReceiveISO88591Line: (OFString*)line
exception: (OFException*)exception
- (bool)socket: (OFTCPSocket*)socket
didReceiveWronglyEncodedLine: (OFString*)line
exception: (OFException*)exception
{
if (line != nil) {
[self IRC_processLine: line];
@ -559,11 +561,12 @@
}
if ([exception isKindOfClass: [OFInvalidEncodingException class]]) {
[socket asyncReadLineWithEncoding: OF_STRING_ENCODING_ISO_8859_1
target: self
selector: @selector(socket:
didReceiveISO88591Line:
exception:)];
[socket
asyncReadLineWithEncoding: _fallbackEncoding
target: self
selector: @selector(socket:
didReceiveWronglyEncodedLine:
exception:)];
return false;
}