TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add method to track active users.

Browse Source 
PiperOrigin-RevId: 632594799
This commit is contained in:
Francis Tsui
2024-05-10 13:55:29 -07:00
committed by Copybara-Service
parent 6d4f2c2606
commit 78729abb7d
5 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/internal/api/app_info.h
+3
View File
@@ -53,6 +53,9 @@ class AppInfo {
// Sets whether the app install event has been logged.
virtual bool SetFirstRunDone(bool value) = 0;
// Update flag to track active users.
virtual bool SetActiveFlag() = 0;
};
} // namespace api
sharing/internal/api/mock_app_info.h
+2
View File
@@ -42,6 +42,8 @@ class MockAppInfo : public nearby::api::AppInfo {
MOCK_METHOD(bool, GetFirstRunDone, (), (override));
MOCK_METHOD(bool, SetFirstRunDone, (bool value), (override));
MOCK_METHOD(bool, SetActiveFlag, (), (override));
};
} // namespace nearby::sharing::api
sharing/nearby_sharing_service_impl.cc
+6 -1
View File
@@ -184,7 +184,8 @@ NearbySharingServiceImpl::NearbySharingServiceImpl(
context_, context_->GetClock(), device_info_, preference_manager_,
local_device_data_manager_.get(), event_logger)),
service_extension_(std::make_unique<NearbySharingServiceExtension>(
context_, settings_.get())) {
context_, settings_.get())),
app_info_(sharing_platform.CreateAppInfo()) {
NL_DCHECK(decoder_);
NL_DCHECK(nearby_connections_manager_);
@@ -672,6 +673,8 @@ void NearbySharingServiceImpl::SendAttachments(
std::move(status_codes_callback)(StatusCodes::kError);
return;
}
app_info_->SetActiveFlag();
ShareTarget share_target = info->share_target();
for (std::unique_ptr<Attachment>& attachment : attachments) {
attachment->MoveToShareTarget(share_target);
@@ -1005,6 +1008,8 @@ void NearbySharingServiceImpl::OnIncomingConnection(
NearbyConnection* connection) {
NL_DCHECK(connection);
app_info_->SetActiveFlag();
// Sync down data from Nearby server when the receiving flow starts, making
// our best effort to have fresh contact and certificate data. There is no
// need to wait for these calls to finish. The periodic server requests will
sharing/nearby_sharing_service_impl.h
+2
View File
@@ -52,6 +52,7 @@
#include "sharing/common/nearby_share_profile_info_provider.h"
#include "sharing/fast_initiation/nearby_fast_initiation.h"
#include "sharing/incoming_share_target_info.h"
#include "sharing/internal/api/app_info.h"
#include "sharing/internal/api/bluetooth_adapter.h"
#include "sharing/internal/api/preference_manager.h"
#include "sharing/internal/api/sharing_platform.h"
@@ -669,6 +670,7 @@ class NearbySharingServiceImpl
// Used to track the time when share sheet activity starts
absl::Time share_foreground_send_surface_start_timestamp_;
std::unique_ptr<nearby::api::AppInfo> app_info_;
};
} // namespace sharing
sharing/nearby_sharing_service_impl_test.cc
+31
View File
@@ -65,6 +65,7 @@
#include "sharing/fast_initiation/nearby_fast_initiation_impl.h"
#include "sharing/file_attachment.h"
#include "sharing/flags/generated/nearby_sharing_feature_flags.h"
#include "sharing/internal/api/mock_app_info.h"
#include "sharing/internal/api/mock_sharing_platform.h"
#include "sharing/internal/api/preference_manager.h"
#include "sharing/internal/public/connectivity_manager.h"
@@ -97,6 +98,7 @@ namespace {
using ConnectionType = ::nearby::ConnectivityManager::ConnectionType;
using SendSurfaceState =
::nearby::sharing::NearbySharingService::SendSurfaceState;
using ::nearby::sharing::api::MockAppInfo;
using ::nearby::sharing::api::PreferenceManager;
using ::nearby::sharing::proto::DataUsage;
using ::nearby::sharing::proto::DeviceVisibility;
@@ -111,6 +113,7 @@ using ::nearby::sharing::service::proto::V1Frame;
using ::testing::InSequence;
using ::testing::NiceMock;
using ::testing::ReturnRef;
using ::testing::StrictMock;
using ::testing::UnorderedElementsAre;
class MockTransferUpdateCallback : public TransferUpdateCallback {
@@ -368,6 +371,10 @@ class NearbySharingServiceImplTest : public testing::Test {
.WillByDefault(ReturnRef(preference_manager_));
ON_CALL(mock_sharing_platform_, GetAccountManager)
.WillByDefault(ReturnRef(fake_account_manager_));
auto mock_app_info = std::make_unique<StrictMock<MockAppInfo>>();
mock_app_info_ = mock_app_info.get();
EXPECT_CALL(mock_sharing_platform_, CreateAppInfo())
.WillOnce(Return(std::move(mock_app_info)));
NearbyShareLocalDeviceDataManagerImpl::Factory::SetFactoryForTesting(
&local_device_data_manager_factory_);
NearbyShareContactManagerImpl::Factory::SetFactoryForTesting(
@@ -784,6 +791,7 @@ class NearbySharingServiceImplTest : public testing::Test {
} else {
SetUpBackgroundReceiveSurface(callback);
}
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
ProcessLatestPublicCertificateDecryption(/*expected_num_calls=*/1,
@@ -976,6 +984,7 @@ class NearbySharingServiceImplTest : public testing::Test {
absl::Notification send_notification;
NearbySharingServiceImpl::StatusCodes send_result;
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->SendAttachments(
target.id, CreateTextAttachments({kTextPayload}),
[&](NearbySharingServiceImpl::StatusCodes status_codes) {
@@ -1248,6 +1257,7 @@ class NearbySharingServiceImplTest : public testing::Test {
nearby_fast_initiation_factory_;
FakeNearbyConnection connection_;
MockNearbySharingDecoder fake_decoder_;
StrictMock<MockAppInfo>* mock_app_info_ = nullptr;
std::unique_ptr<NearbySharingServiceImpl> service_;
int expect_transfer_updates_count_ = 0;
std::function<void()> expect_transfer_updates_callback_;
@@ -2353,6 +2363,7 @@ TEST_F(NearbySharingServiceImplTest,
SetUpKeyVerification(/*is_incoming=*/true,
service::proto::PairedKeyResultFrame::SUCCESS);
SetUpForegroundReceiveSurface(callback);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
ProcessLatestPublicCertificateDecryption(/*expected_num_calls=*/1,
@@ -2392,6 +2403,7 @@ TEST_F(NearbySharingServiceImplTest, IncomingConnectionEmptyIntroductionFrame) {
SetUpKeyVerification(/*is_incoming=*/true,
service::proto::PairedKeyResultFrame::SUCCESS);
SetUpForegroundReceiveSurface(callback);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
ProcessLatestPublicCertificateDecryption(/*expected_num_calls=*/1,
@@ -2440,6 +2452,7 @@ TEST_F(NearbySharingServiceImplTest,
SetUpKeyVerification(/*is_incoming=*/true,
service::proto::PairedKeyResultFrame::SUCCESS);
SetUpForegroundReceiveSurface(callback);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
ProcessLatestPublicCertificateDecryption(/*expected_num_calls=*/1,
@@ -2553,6 +2566,7 @@ TEST_F(NearbySharingServiceImplTest, IncomingConnectionOutOfStorage) {
SetUpKeyVerification(
/*is_incoming=*/true, PairedKeyResultFrame::SUCCESS);
SetUpForegroundReceiveSurface(callback);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
ProcessLatestPublicCertificateDecryption(/*expected_num_calls=*/1,
@@ -2632,6 +2646,7 @@ TEST_F(NearbySharingServiceImplTest, IncomingConnectionFileSizeOverflow) {
SetUpKeyVerification(
/*is_incoming=*/true, PairedKeyResultFrame::SUCCESS);
SetUpForegroundReceiveSurface(callback);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
ProcessLatestPublicCertificateDecryption(/*expected_num_calls=*/1,
@@ -2676,6 +2691,7 @@ TEST_F(NearbySharingServiceImplTest,
SetUpKeyVerification(/*is_incoming=*/true, PairedKeyResultFrame::SUCCESS);
SetUpForegroundReceiveSurface(callback);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
ProcessLatestPublicCertificateDecryption(/*expected_num_calls=*/1,
@@ -3103,6 +3119,7 @@ TEST_F(NearbySharingServiceImplTest,
SetUpKeyVerification(/*is_incoming=*/true, PairedKeyResultFrame::UNABLE);
SetUpForegroundReceiveSurface(callback);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
@@ -3159,6 +3176,7 @@ TEST_F(NearbySharingServiceImplTest,
&callback, NearbySharingService::ReceiveSurfaceState::kBackground);
EXPECT_EQ(result, NearbySharingService::StatusCodes::kOk);
EXPECT_TRUE(fake_nearby_connections_manager_->IsAdvertising());
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
@@ -3196,6 +3214,7 @@ TEST_F(NearbySharingServiceImplTest,
EXPECT_CALL(fake_decoder_, DecodeFrame(testing::Eq(bytes))).Times(0);
connection_.AppendReadableData(bytes);
FlushTesting();
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
@@ -3230,6 +3249,7 @@ TEST_F(NearbySharingServiceImplTest,
EXPECT_CALL(fake_decoder_, DecodeFrame(testing::Eq(bytes))).Times(0);
connection_.AppendReadableData(bytes);
FlushTesting();
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
service_->OnIncomingConnection(kEndpointId, GetValidV1EndpointInfo(),
&connection_);
@@ -3296,6 +3316,7 @@ TEST_F(NearbySharingServiceImplTest, RegisterReceiveSurfaceWhileSending) {
TransferMetadata::Status::kAwaitingLocalConfirmation,
TransferMetadata::Status::kAwaitingRemoteAcceptance},
[&]() { notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateTextAttachments({kTextPayload})),
NearbySharingServiceImpl::StatusCodes::kOk);
EXPECT_TRUE(notification.WaitForNotificationWithTimeout(kWaitTimeout));
@@ -3320,6 +3341,7 @@ TEST_F(NearbySharingServiceImplTest, SendTextAlreadySending) {
TransferMetadata::Status::kAwaitingLocalConfirmation,
TransferMetadata::Status::kAwaitingRemoteAcceptance},
[&]() { notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateTextAttachments({kTextPayload})),
NearbySharingServiceImpl::StatusCodes::kOk);
EXPECT_TRUE(notification.WaitForNotificationWithTimeout(kWaitTimeout));
@@ -3377,6 +3399,7 @@ TEST_F(NearbySharingServiceImplTest, SendTextFailedToConnect) {
{TransferMetadata::Status::kConnecting,
TransferMetadata::Status::kFailedToInitiateOutgoingConnection},
[&]() { notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateTextAttachments({kTextPayload})),
NearbySharingServiceImpl::StatusCodes::kOk);
@@ -3402,6 +3425,7 @@ TEST_F(NearbySharingServiceImplTest, SendTextFailedKeyVerification) {
fake_nearby_connections_manager_->SetRawAuthenticationToken(kEndpointId,
GetToken());
fake_nearby_connections_manager_->set_nearby_connection(&connection_);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateTextAttachments({kTextPayload})),
NearbySharingServiceImpl::StatusCodes::kOk);
@@ -3427,6 +3451,8 @@ TEST_F(NearbySharingServiceImplTest, SendTextUnableToVerifyKey) {
fake_nearby_connections_manager_->SetRawAuthenticationToken(kEndpointId,
GetToken());
fake_nearby_connections_manager_->set_nearby_connection(&connection_);
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateTextAttachments({kTextPayload})),
NearbySharingServiceImpl::StatusCodes::kOk);
EXPECT_TRUE(notification.WaitForNotificationWithTimeout(kWaitTimeout));
@@ -3450,6 +3476,7 @@ TEST_P(NearbySharingServiceImplSendFailureTest, SendTextRemoteFailure) {
TransferMetadata::Status::kAwaitingLocalConfirmation,
TransferMetadata::Status::kAwaitingRemoteAcceptance},
[&]() { notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateTextAttachments({kTextPayload})),
NearbySharingServiceImpl::StatusCodes::kOk);
@@ -3489,6 +3516,7 @@ TEST_P(NearbySharingServiceImplSendFailureTest, SendFilesRemoteFailure) {
TransferMetadata::Status::kAwaitingLocalConfirmation,
TransferMetadata::Status::kAwaitingRemoteAcceptance},
[&]() { notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateFileAttachments({path})),
NearbySharingServiceImpl::StatusCodes::kOk);
@@ -3528,6 +3556,7 @@ TEST_F(NearbySharingServiceImplTest, SendTextSuccess) {
TransferMetadata::Status::kAwaitingLocalConfirmation,
TransferMetadata::Status::kAwaitingRemoteAcceptance},
[&]() { notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateTextAttachments({kTextPayload})),
NearbySharingServiceImpl::StatusCodes::kOk);
@@ -3623,6 +3652,7 @@ TEST_F(NearbySharingServiceImplTest, SendFilesSuccess) {
TransferMetadata::Status::kAwaitingLocalConfirmation,
TransferMetadata::Status::kAwaitingRemoteAcceptance},
[&]() { introduction_notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateFileAttachments({path})),
NearbySharingServiceImpl::StatusCodes::kOk);
@@ -3688,6 +3718,7 @@ TEST_F(NearbySharingServiceImplTest, SendWifiCredentialsSuccess) {
TransferMetadata::Status::kAwaitingLocalConfirmation,
TransferMetadata::Status::kAwaitingRemoteAcceptance},
[&]() { introduction_notification.Notify(); });
EXPECT_CALL(*mock_app_info_, SetActiveFlag());
EXPECT_EQ(SendAttachments(target, CreateWifiCredentialAttachments(
"GoogleGuest", "password")),