From 357635251d956f2c225bda2d0842b89e657a9d8a Mon Sep 17 00:00:00 2001
From: Francis Tsui <ftsui@google.com>
Date: Wed, 24 Jul 2024 13:33:27 -0700
Subject: [PATCH] Move accept timer cancellation back to when Accept is sent.

PiperOrigin-RevId: 655682894
---
 sharing/incoming_share_session.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sharing/incoming_share_session.cc b/sharing/incoming_share_session.cc
index 51910b8e..7df0e6af 100644
--- a/sharing/incoming_share_session.cc
+++ b/sharing/incoming_share_session.cc
@@ -218,6 +218,10 @@ bool IncomingShareSession::AcceptTransfer(
     NL_LOG(WARNING) << __func__ << ": out of order API call.";
     return false;
   }
+  // TODO(b/355199584): Cancel acceptance timer when Accept is sent.
+  // This is the wrong place to cancel since we are actually waiting for sender
+  // to accept.  If sender does not accept, we will never timeout.
+  mutual_acceptance_timeout_.reset();
   ready_for_accept_ = false;
   const absl::flat_hash_map<int64_t, int64_t>& payload_map =
       attachment_payload_map();