@@ -16,30 +16,11 @@ static void ResizeChannelBuffer(NSObject<FlutterBinaryMessenger>* binaryMessenge
1616 [binaryMessenger sendOnChannel: FlutterChannelBuffersChannel message: message];
1717}
1818
19- static FlutterBinaryMessengerConnection SetMessageHandler (
20- NSObject <FlutterBinaryMessenger>* messenger,
21- NSString * name,
22- FlutterBinaryMessageHandler handler,
23- NSObject <FlutterTaskQueue>* taskQueue) {
24- if (taskQueue) {
25- NSCAssert ([messenger respondsToSelector: @selector (setMessageHandlerOnChannel:
26- binaryMessageHandler:taskQueue: )],
27- @" "
28- return [messenger setMessageHandlerOnChannel: name
29- binaryMessageHandler: handler
30- taskQueue: taskQueue];
31- } else {
32- return [messenger setMessageHandlerOnChannel: name binaryMessageHandler: handler];
33- }
34- }
35-
36- // //////////////////////////////////////////////////////////////////////////////
3719@implementation FlutterBasicMessageChannel {
3820 NSObject <FlutterBinaryMessenger>* _messenger;
3921 NSString * _name;
4022 NSObject <FlutterMessageCodec>* _codec;
4123 FlutterBinaryMessengerConnection _connection;
42- NSObject <FlutterTaskQueue>* _taskQueue;
4324}
4425+ (instancetype )messageChannelWithName : (NSString *)name
4526 binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger {
@@ -59,28 +40,18 @@ + (instancetype)messageChannelWithName:(NSString*)name
5940- (instancetype )initWithName : (NSString *)name
6041 binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger
6142 codec : (NSObject <FlutterMessageCodec>*)codec {
62- self = [self initWithName: name binaryMessenger: messenger codec: codec taskQueue: nil ];
63- return self;
64- }
65-
66- - (instancetype )initWithName : (NSString *)name
67- binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger
68- codec : (NSObject <FlutterMessageCodec>*)codec
69- taskQueue : (NSObject <FlutterTaskQueue>*)taskQueue {
7043 self = [super init ];
7144 NSAssert (self, @" Super init cannot be nil"
7245 _name = [name retain ];
7346 _messenger = [messenger retain ];
7447 _codec = [codec retain ];
75- _taskQueue = [taskQueue retain ];
7648 return self;
7749}
7850
7951- (void )dealloc {
8052 [_name release ];
8153 [_messenger release ];
8254 [_codec release ];
83- [_taskQueue release ];
8455 [super dealloc ];
8556}
8657
@@ -114,7 +85,7 @@ - (void)setMessageHandler:(FlutterMessageHandler)handler {
11485 callback ([codec encode: reply]);
11586 });
11687 };
117- _connection = SetMessageHandler ( _messenger, _name, messageHandler, _taskQueue) ;
88+ _connection = [ _messenger setMessageHandlerOnChannel: _name binaryMessageHandler: messageHandler] ;
11889}
11990
12091- (void )resizeChannelBuffer : (NSInteger )newSize {
@@ -125,7 +96,6 @@ - (void)resizeChannelBuffer:(NSInteger)newSize {
12596
12697#pragma mark - Method channel
12798
128- // //////////////////////////////////////////////////////////////////////////////
12999@implementation FlutterError
130100+ (instancetype )errorWithCode : (NSString *)code message : (NSString *)message details : (id )details {
131101 return [[[FlutterError alloc ] initWithCode: code message: message details: details] autorelease ];
@@ -166,7 +136,6 @@ - (NSUInteger)hash {
166136}
167137@end
168138
169- // //////////////////////////////////////////////////////////////////////////////
170139@implementation FlutterMethodCall
171140+ (instancetype )methodCallWithMethodName : (NSString *)method arguments : (id )arguments {
172141 return [[[FlutterMethodCall alloc ] initWithMethodName: method arguments: arguments] autorelease ];
@@ -206,13 +175,11 @@ - (NSUInteger)hash {
206175
207176NSObject const * FlutterMethodNotImplemented = [[NSObject alloc ] init ];
208177
209- // //////////////////////////////////////////////////////////////////////////////
210178@implementation FlutterMethodChannel {
211179 NSObject <FlutterBinaryMessenger>* _messenger;
212180 NSString * _name;
213181 NSObject <FlutterMethodCodec>* _codec;
214182 FlutterBinaryMessengerConnection _connection;
215- NSObject <FlutterTaskQueue>* _taskQueue;
216183}
217184
218185+ (instancetype )methodChannelWithName : (NSString *)name
@@ -231,27 +198,18 @@ + (instancetype)methodChannelWithName:(NSString*)name
231198- (instancetype )initWithName : (NSString *)name
232199 binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger
233200 codec : (NSObject <FlutterMethodCodec>*)codec {
234- self = [self initWithName: name binaryMessenger: messenger codec: codec taskQueue: nil ];
235- return self;
236- }
237- - (instancetype )initWithName : (NSString *)name
238- binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger
239- codec : (NSObject <FlutterMethodCodec>*)codec
240- taskQueue : (NSObject <FlutterTaskQueue>*)taskQueue {
241201 self = [super init ];
242202 NSAssert (self, @" Super init cannot be nil"
243203 _name = [name retain ];
244204 _messenger = [messenger retain ];
245205 _codec = [codec retain ];
246- _taskQueue = [taskQueue retain ];
247206 return self;
248207}
249208
250209- (void )dealloc {
251210 [_name release ];
252211 [_messenger release ];
253212 [_codec release ];
254- [_taskQueue release ];
255213 [super dealloc ];
256214}
257215
@@ -298,7 +256,7 @@ - (void)setMethodCallHandler:(FlutterMethodCallHandler)handler {
298256 }
299257 });
300258 };
301- _connection = SetMessageHandler ( _messenger, _name, messageHandler, _taskQueue) ;
259+ _connection = [ _messenger setMessageHandlerOnChannel: _name binaryMessageHandler: messageHandler] ;
302260}
303261
304262- (void )resizeChannelBuffer : (NSInteger )newSize {
@@ -311,13 +269,10 @@ - (void)resizeChannelBuffer:(NSInteger)newSize {
311269
312270NSObject const * FlutterEndOfEventStream = [[NSObject alloc ] init ];
313271
314- // //////////////////////////////////////////////////////////////////////////////
315272@implementation FlutterEventChannel {
316273 NSObject <FlutterBinaryMessenger>* _messenger;
317274 NSString * _name;
318275 NSObject <FlutterMethodCodec>* _codec;
319- NSObject <FlutterTaskQueue>* _taskQueue;
320- FlutterBinaryMessengerConnection _connection;
321276}
322277+ (instancetype )eventChannelWithName : (NSString *)name
323278 binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger {
@@ -335,36 +290,25 @@ + (instancetype)eventChannelWithName:(NSString*)name
335290- (instancetype )initWithName : (NSString *)name
336291 binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger
337292 codec : (NSObject <FlutterMethodCodec>*)codec {
338- return [self initWithName: name binaryMessenger: messenger codec: codec taskQueue: nil ];
339- }
340-
341- - (instancetype )initWithName : (NSString *)name
342- binaryMessenger : (NSObject <FlutterBinaryMessenger>*)messenger
343- codec : (NSObject <FlutterMethodCodec>*)codec
344- taskQueue : (NSObject <FlutterTaskQueue>* _Nullable)taskQueue {
345293 self = [super init ];
346294 NSAssert (self, @" Super init cannot be nil"
347295 _name = [name retain ];
348296 _messenger = [messenger retain ];
349297 _codec = [codec retain ];
350- _taskQueue = [taskQueue retain ];
351298 return self;
352299}
353300
354301- (void )dealloc {
355302 [_name release ];
356303 [_codec release ];
357304 [_messenger release ];
358- [_taskQueue release ];
359305 [super dealloc ];
360306}
361307
362- static FlutterBinaryMessengerConnection SetStreamHandlerMessageHandlerOnChannel (
363- NSObject <FlutterStreamHandler>* handler,
364- NSString * name,
365- NSObject <FlutterBinaryMessenger>* messenger,
366- NSObject <FlutterMethodCodec>* codec,
367- NSObject <FlutterTaskQueue>* taskQueue) {
308+ static void SetStreamHandlerMessageHandlerOnChannel (NSObject <FlutterStreamHandler>* handler,
309+ NSString * name,
310+ NSObject <FlutterBinaryMessenger>* messenger,
311+ NSObject <FlutterMethodCodec>* codec) {
368312 __block FlutterEventSink currentSink = nil ;
369313 FlutterBinaryMessageHandler messageHandler = ^(NSData * message, FlutterBinaryReply callback) {
370314 FlutterMethodCall* call = [codec decodeMethodCall: message];
@@ -410,16 +354,14 @@ static FlutterBinaryMessengerConnection SetStreamHandlerMessageHandlerOnChannel(
410354 callback (nil );
411355 }
412356 };
413- return SetMessageHandler ( messenger, name, messageHandler, taskQueue) ;
357+ [ messenger setMessageHandlerOnChannel: name binaryMessageHandler: messageHandler] ;
414358}
415359
416360- (void )setStreamHandler : (NSObject <FlutterStreamHandler>*)handler {
417361 if (!handler) {
418- [_messenger cleanUpConnection: _connection];
419- _connection = 0 ;
362+ [_messenger setMessageHandlerOnChannel: _name binaryMessageHandler: nil ];
420363 return ;
421364 }
422- _connection =
423- SetStreamHandlerMessageHandlerOnChannel (handler, _name, _messenger, _codec, _taskQueue);
365+ SetStreamHandlerMessageHandlerOnChannel (handler, _name, _messenger, _codec);
424366}
425367@end
0 commit comments