[macos] Revert check on FlutterCodecs and refactor message function] (#10009)

franciscojma86 · web-flow · commit bd3870219a1a · 2019-07-23T15:22:38.000-07:00
* [macos] Revert check on FlutterCodecs and refactor message function]

* Remove duplicated code

* Move FlutterPlatformMessage initialization
diff --git a/shell/platform/darwin/common/framework/Source/FlutterChannels.mm b/shell/platform/darwin/common/framework/Source/FlutterChannels.mm
@@ -51,7 +51,7 @@ - (void)sendMessage:(id)message {
 - (void)sendMessage:(id)message reply:(FlutterReply)callback {
   FlutterBinaryReply reply = ^(NSData* data) {
     if (callback)
-      callback([_codec decode:data]);
+      callback(data.length > 0 ? [_codec decode:data] : nil);
   };
   [_messenger sendOnChannel:_name message:[_codec encode:message] binaryReply:reply];
 }
diff --git a/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm b/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm
@@ -73,7 +73,7 @@ - (NSData*)encode:(id)message {
 }
 
 - (id)decode:(NSData*)message {
-  if (message.length == 0)
+  if (message == nil)
     return nil;
   BOOL isSimpleValue = NO;
   id decoded = nil;
diff --git a/shell/platform/darwin/macos/framework/Source/FLEEngine.mm b/shell/platform/darwin/macos/framework/Source/FLEEngine.mm
@@ -332,42 +332,35 @@ - (void)shutDownEngine {
 #pragma mark - FlutterBinaryMessenger
 
 - (void)sendOnChannel:(nonnull NSString*)channel message:(nullable NSData*)message {
-  FlutterPlatformMessage platformMessage = {
-      .struct_size = sizeof(FlutterPlatformMessage),
-      .channel = [channel UTF8String],
-      .message = static_cast<const uint8_t*>(message.bytes),
-      .message_size = message.length,
-  };
-
-  FlutterEngineResult result = FlutterEngineSendPlatformMessage(_engine, &platformMessage);
-  if (result != kSuccess) {
-    NSLog(@"Failed to send message to Flutter engine on channel '%@' (%d).", channel, result);
-  }
+  [self sendOnChannel:channel message:message binaryReply:nil];
 }
 
 - (void)sendOnChannel:(NSString*)channel
               message:(NSData* _Nullable)message
           binaryReply:(FlutterBinaryReply _Nullable)callback {
-  struct Captures {
-    FlutterBinaryReply reply;
-  };
-  auto captures = std::make_unique<Captures>();
-  captures->reply = callback;
-  auto message_reply = [](const uint8_t* data, size_t data_size, void* user_data) {
-    auto captures = reinterpret_cast<Captures*>(user_data);
-    NSData* reply_data = [NSData dataWithBytes:(void*)data length:data_size];
-    captures->reply(reply_data);
-    delete captures;
-  };
-
   FlutterPlatformMessageResponseHandle* response_handle = nullptr;
-  FlutterEngineResult result = FlutterPlatformMessageCreateResponseHandle(
-      _engine, message_reply, captures.get(), &response_handle);
-  if (result != kSuccess) {
-    NSLog(@"Failed to create a FlutterPlatformMessageResponseHandle");
-    return;
+
+  if (callback) {
+    struct Captures {
+      FlutterBinaryReply reply;
+    };
+    auto captures = std::make_unique<Captures>();
+    captures->reply = callback;
+    auto message_reply = [](const uint8_t* data, size_t data_size, void* user_data) {
+      auto captures = reinterpret_cast<Captures*>(user_data);
+      NSData* reply_data = [NSData dataWithBytes:static_cast<const void*>(data) length:data_size];
+      captures->reply(reply_data);
+      delete captures;
+    };
+
+    FlutterEngineResult create_result = FlutterPlatformMessageCreateResponseHandle(
+        _engine, message_reply, captures.get(), &response_handle);
+    if (create_result != kSuccess) {
+      NSLog(@"Failed to create a FlutterPlatformMessageResponseHandle (%d)", create_result);
+      return;
+    }
+    captures.release();
   }
-  captures.release();
 
   FlutterPlatformMessage platformMessage = {
       .struct_size = sizeof(FlutterPlatformMessage),
@@ -377,15 +370,19 @@ - (void)sendOnChannel:(NSString*)channel
       .response_handle = response_handle,
   };
 
-  result = FlutterEngineSendPlatformMessage(_engine, &platformMessage);
-  if (result != kSuccess) {
-    NSLog(@"Failed to send message to Flutter engine on channel '%@' (%d).", channel, result);
+  FlutterEngineResult message_result = FlutterEngineSendPlatformMessage(_engine, &platformMessage);
+  if (message_result != kSuccess) {
+    NSLog(@"Failed to send message to Flutter engine on channel '%@' (%d).", channel,
+          message_result);
   }
 
-  result = FlutterPlatformMessageReleaseResponseHandle(_engine, response_handle);
-  if (result != kSuccess) {
-    NSLog(@"Failed to release the response handle");
-  };
+  if (response_handle != nullptr) {
+    FlutterEngineResult release_result =
+        FlutterPlatformMessageReleaseResponseHandle(_engine, response_handle);
+    if (release_result != kSuccess) {
+      NSLog(@"Failed to release the response handle (%d).", release_result);
+    };
+  }
 }
 
 - (void)setMessageHandlerOnChannel:(nonnull NSString*)channel

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ - (void)sendMessage:(id)message {`
`51`	`51`	`- (void)sendMessage:(id)message reply:(FlutterReply)callback {`
`52`	`52`	`FlutterBinaryReply reply = ^(NSData* data) {`
`53`	`53`	`if (callback)`
`54`		`- callback([_codec decode:data]);`
	`54`	`+ callback(data.length > 0 ? [_codec decode:data] : nil);`
`55`	`55`	`};`
`56`	`56`	`[_messenger sendOnChannel:_name message:[_codec encode:message] binaryReply:reply];`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ - (NSData*)encode:(id)message {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`- (id)decode:(NSData*)message {`
`76`		`- if (message.length == 0)`
	`76`	`+ if (message == nil)`
`77`	`77`	`return nil;`
`78`	`78`	`BOOL isSimpleValue = NO;`
`79`	`79`	`id decoded = nil;`