Fix handling of unimplemented method

Airyzz · Airyzz · commit 044714e4240f · 2024-04-11T11:04:52.000+09:30
diff --git a/common/cpp/include/flutter_frame_cryptor.h b/common/cpp/include/flutter_frame_cryptor.h
@@ -23,9 +23,11 @@ class FlutterFrameCryptor {
  public:
   FlutterFrameCryptor(FlutterWebRTCBase* base) : base_(base) {}
 
+  // Since this takes ownership of result, ownership will be passed back to 'outResult' if this function fails
   bool HandleFrameCryptorMethodCall(
     const MethodCallProxy& method_call,
-    std::unique_ptr<MethodResultProxy> result);
+    std::unique_ptr<MethodResultProxy> result,
+    std::unique_ptr<MethodResultProxy> *outResult);
 
   void FrameCryptorFactoryCreateFrameCryptor(
       const EncodableMap& constraints,
diff --git a/common/cpp/src/flutter_frame_cryptor.cc b/common/cpp/src/flutter_frame_cryptor.cc
@@ -48,7 +48,8 @@ void FlutterFrameCryptorObserver::OnFrameCryptionStateChanged(
 
 bool FlutterFrameCryptor::HandleFrameCryptorMethodCall(
     const MethodCallProxy& method_call,
-    std::unique_ptr<MethodResultProxy> result) {
+    std::unique_ptr<MethodResultProxy> result,
+    std::unique_ptr<MethodResultProxy> *outResult) {
   const std::string& method_name = method_call.method_name();
   if (!method_call.arguments()) {
     result->Error("Bad Arguments", "Null arguments received");
@@ -102,7 +103,8 @@ bool FlutterFrameCryptor::HandleFrameCryptorMethodCall(
     KeyProviderDispose(params, std::move(result));
     return true;
   }
-
+  
+  *outResult = std::move(result);
   return false;
 }
 
diff --git a/common/cpp/src/flutter_webrtc.cc b/common/cpp/src/flutter_webrtc.cc
@@ -1241,10 +1241,12 @@ void FlutterWebRTC::HandleMethodCall(
     state[EncodableValue("state")] =
         peerConnectionStateString(pc->peer_connection_state());
     result->Success(EncodableValue(state));
-  } else if (HandleFrameCryptorMethodCall(method_call, std::move(result))) {
-    // Do nothing
   } else {
-    result->NotImplemented();
+    if (HandleFrameCryptorMethodCall(method_call, std::move(result), &result)) {
+      return;
+    } else {
+      result->NotImplemented();
+    }
   }
 }
 
