Split frame handler for incoming and outgoing sessions.

PiperOrigin-RevId: 870909627

Author: ftsui

sharing/incoming_frames_reader.cc

@@ -159,6 +159,7 @@ void IncomingFramesReader::OnDataReadFromConnection(
   {
     absl::MutexLock lock(mutex_);
     if (read_frame_info_queue_.empty()) {
+      // Drop the frame if no one is waiting.
       return;
     }
     const ReadFrameInfo& frame_info = read_frame_info_queue_.front();
@@ -210,12 +211,9 @@ void IncomingFramesReader::Done(std::unique_ptr<V1Frame> frame) {
     read_frame_info_queue_.pop();
   }
 
-  if (read_frame_info.timeout != absl::ZeroDuration()) {
-    ReadFrame(*read_frame_info.frame_type, std::move(read_frame_info.callback),
-              read_frame_info.timeout);
-  } else {
-    ReadFrame(std::move(read_frame_info.callback), read_frame_info.timeout);
-  }
+  ProcessReadRequest(read_frame_info.frame_type,
+                     std::move(read_frame_info.callback),
+                     read_frame_info.timeout);
 }
 
 std::unique_ptr<V1Frame> IncomingFramesReader::PopCachedFrame(

sharing/incoming_share_session.cc

@@ -192,30 +192,6 @@ IncomingShareSession::ProcessIntroduction(
   return std::nullopt;
 }
 
-bool IncomingShareSession::ProcessKeyVerificationResult(
-    PairedKeyVerificationRunner::PairedKeyVerificationResult result,
-    OSType share_target_os_type,
-    std::function<void(std::optional<IntroductionFrame>)>
-        introduction_callback) {
-  if (!HandleKeyVerificationResult(result, share_target_os_type)) {
-    return false;
-  }
-  LOG(INFO) << ":Waiting for introduction from " << share_target().id;
-
-  frames_reader()->ReadFrame(
-      V1Frame::INTRODUCTION,
-      [callback = std::move(introduction_callback)](
-          bool is_timeout, std::optional<V1Frame> frame) {
-        if (!frame.has_value()) {
-          callback(std::nullopt);
-        } else {
-          callback(frame->introduction());
-        }
-      },
-      kReadFramesTimeout);
-  return true;
-}
-
 bool IncomingShareSession::ReadyForTransfer(
     std::function<void()> accept_timeout_callback,
     std::function<void(bool is_timeout, std::optional<V1Frame> frame)>

sharing/incoming_share_session.h

@@ -61,17 +61,6 @@ class IncomingShareSession : public ShareSession {
       const nearby::sharing::service::proto::IntroductionFrame&
           introduction_frame);
 
-  // Processes the PairedKeyVerificationResult.
-  // Returns true if verification was successful and the session is now waiting
-  // for the introduction frame.  Calls |introduction_callback| when it is
-  // received.
-  bool ProcessKeyVerificationResult(
-      PairedKeyVerificationRunner::PairedKeyVerificationResult result,
-      location::nearby::proto::sharing::OSType share_target_os_type,
-      std::function<void(
-          std::optional<nearby::sharing::service::proto::IntroductionFrame>)>
-          introduction_callback);
-
   // Returns true if the transfer can begin and AcceptTransfer should be called
   // immediately.
   // Returns false if user needs to accept the transfer.

sharing/incoming_share_session_test.cc

@@ -1235,139 +1235,6 @@ TEST_F(IncomingShareSessionTest, AcceptTransferSuccess) {
             ConnectionResponseFrame::ACCEPT);
 }
 
-TEST_F(IncomingShareSessionTest, ProcessKeyVerificationResultSuccess) {
-  session_.OnConnected(&connection_);
-  session_.SetTokenForTests("1234");
-
-  bool introduction_received = false;
-  EXPECT_THAT(
-      session_.ProcessKeyVerificationResult(
-          PairedKeyVerificationRunner::PairedKeyVerificationResult::kSuccess,
-          OSType::WINDOWS,
-          [&introduction_received](std::optional<IntroductionFrame>) {
-            introduction_received = true;
-          }),
-      IsTrue());
-
-  EXPECT_THAT(session_.self_share(), IsFalse());
-  EXPECT_THAT(session_.token(), IsEmpty());
-  EXPECT_THAT(session_.os_type(), Eq(OSType::WINDOWS));
-  EXPECT_THAT(introduction_received, IsFalse());
-
-  // Send Introduction frame
-  nearby::sharing::service::proto::Frame frame =
-      nearby::sharing::service::proto::Frame();
-  frame.set_version(nearby::sharing::service::proto::Frame::V1);
-  V1Frame* v1frame = frame.mutable_v1();
-  v1frame->set_type(service::proto::V1Frame::INTRODUCTION);
-  v1frame->mutable_introduction();
-  std::vector<uint8_t> data;
-  data.resize(frame.ByteSizeLong());
-  EXPECT_THAT(frame.SerializeToArray(data.data(), data.size()), IsTrue());
-  connection_.WriteMessage(std::move(data));
-
-  EXPECT_THAT(introduction_received, IsTrue());
-}
-
-TEST_F(IncomingShareSessionTest, ProcessKeyVerificationResultFail) {
-  session_.OnConnected(&connection_);
-  session_.SetTokenForTests("1234");
-
-  bool introduction_received = false;
-  EXPECT_THAT(
-      session_.ProcessKeyVerificationResult(
-          PairedKeyVerificationRunner::PairedKeyVerificationResult::kFail,
-          OSType::WINDOWS,
-          [&introduction_received](std::optional<IntroductionFrame>) {
-            introduction_received = true;
-          }),
-      IsFalse());
-
-  EXPECT_THAT(session_.token(), Eq("1234"));
-  EXPECT_THAT(session_.os_type(), Eq(OSType::WINDOWS));
-  EXPECT_THAT(introduction_received, IsFalse());
-
-  // Send Introduction frame
-  nearby::sharing::service::proto::Frame frame =
-      nearby::sharing::service::proto::Frame();
-  frame.set_version(nearby::sharing::service::proto::Frame::V1);
-  V1Frame* v1frame = frame.mutable_v1();
-  v1frame->set_type(service::proto::V1Frame::INTRODUCTION);
-  v1frame->mutable_introduction();
-  std::vector<uint8_t> data;
-  data.resize(frame.ByteSizeLong());
-  EXPECT_THAT(frame.SerializeToArray(data.data(), data.size()), IsTrue());
-  connection_.WriteMessage(std::move(data));
-
-  EXPECT_THAT(introduction_received, IsFalse());
-}
-
-TEST_F(IncomingShareSessionTest, ProcessKeyVerificationResultUnable) {
-  session_.OnConnected(&connection_);
-  session_.SetTokenForTests("1234");
-
-  bool introduction_received = false;
-  EXPECT_THAT(
-      session_.ProcessKeyVerificationResult(
-          PairedKeyVerificationRunner::PairedKeyVerificationResult::kUnable,
-          OSType::WINDOWS,
-          [&introduction_received](std::optional<IntroductionFrame>) {
-            introduction_received = true;
-          }),
-      IsTrue());
-
-  EXPECT_THAT(session_.token(), Eq("1234"));
-  EXPECT_THAT(session_.os_type(), Eq(OSType::WINDOWS));
-  EXPECT_THAT(introduction_received, IsFalse());
-
-  // Send Introduction frame
-  nearby::sharing::service::proto::Frame frame =
-      nearby::sharing::service::proto::Frame();
-  frame.set_version(nearby::sharing::service::proto::Frame::V1);
-  V1Frame* v1frame = frame.mutable_v1();
-  v1frame->set_type(service::proto::V1Frame::INTRODUCTION);
-  v1frame->mutable_introduction();
-  std::vector<uint8_t> data;
-  data.resize(frame.ByteSizeLong());
-  EXPECT_THAT(frame.SerializeToArray(data.data(), data.size()), IsTrue());
-  connection_.WriteMessage(std::move(data));
-
-  EXPECT_THAT(introduction_received, IsTrue());
-}
-
-TEST_F(IncomingShareSessionTest, ProcessKeyVerificationResultUnknown) {
-  session_.OnConnected(&connection_);
-  session_.SetTokenForTests("1234");
-
-  bool introduction_received = false;
-  EXPECT_THAT(
-      session_.ProcessKeyVerificationResult(
-          PairedKeyVerificationRunner::PairedKeyVerificationResult::kUnknown,
-          OSType::WINDOWS,
-          [&introduction_received](std::optional<IntroductionFrame>) {
-            introduction_received = true;
-          }),
-      IsFalse());
-
-  EXPECT_THAT(session_.token(), Eq("1234"));
-  EXPECT_THAT(session_.os_type(), Eq(OSType::WINDOWS));
-  EXPECT_THAT(introduction_received, IsFalse());
-
-  // Send Introduction frame
-  nearby::sharing::service::proto::Frame frame =
-      nearby::sharing::service::proto::Frame();
-  frame.set_version(nearby::sharing::service::proto::Frame::V1);
-  V1Frame* v1frame = frame.mutable_v1();
-  v1frame->set_type(service::proto::V1Frame::INTRODUCTION);
-  v1frame->mutable_introduction();
-  std::vector<uint8_t> data;
-  data.resize(frame.ByteSizeLong());
-  EXPECT_THAT(frame.SerializeToArray(data.data(), data.size()), IsTrue());
-  connection_.WriteMessage(std::move(data));
-
-  EXPECT_THAT(introduction_received, IsFalse());
-}
-
 TEST_F(IncomingShareSessionTest, TryUpgradeBandwidthNotNeeded) {
   session_.OnConnected(&connection_);