From d4aa4e3a2b25e5204a955e8687f5def6154670ab Mon Sep 17 00:00:00 2001 From: Anay Wadhera Date: Thu, 20 Jun 2024 10:46:35 -0700 Subject: [PATCH] Remove Get/SetIsReceiving PiperOrigin-RevId: 645085883 --- sharing/common/nearby_share_prefs.cc | 3 -- sharing/common/nearby_share_prefs.h | 1 - sharing/nearby_sharing_service_impl.cc | 43 ++++----------- sharing/nearby_sharing_service_impl.h | 1 - sharing/nearby_sharing_service_impl_test.cc | 58 +++++++++++++-------- sharing/nearby_sharing_settings.cc | 14 ----- sharing/nearby_sharing_settings_test.cc | 3 -- sharing/proto/enums.proto | 2 +- 8 files changed, 46 insertions(+), 79 deletions(-) diff --git a/sharing/common/nearby_share_prefs.cc b/sharing/common/nearby_share_prefs.cc index 3366b843..e755acc3 100644 --- a/sharing/common/nearby_share_prefs.cc +++ b/sharing/common/nearby_share_prefs.cc @@ -94,8 +94,6 @@ ABSL_CONST_INIT const char kNearbySharingSchedulerUploadLocalDeviceCertificatesName[] = "nearby_sharing.scheduler.upload_local_device_certificates"; ABSL_CONST_INIT const char kNearbySharingUsersName[] = "nearby_sharing.users"; -ABSL_CONST_INIT const char kNearbySharingIsReceivingName[] = - "nearby_sharing.is_receiving"; ABSL_CONST_INIT const char kNearbySharingIsAnalyticsEnabledName[] = "nearby_sharing.is_analytics_enabled"; ABSL_CONST_INIT const char kNearbySharingIsAllContactsEnabledName[] = @@ -117,7 +115,6 @@ void RegisterNearbySharingPrefs(PreferenceManager& preference_manager, preference_manager.SetInteger( kNearbySharingBackgroundFallbackVisibilityName, static_cast(kDefaultFallbackVisibility)); - preference_manager.SetBoolean(kNearbySharingIsReceivingName, true); preference_manager.SetBoolean(kNearbySharingIsAnalyticsEnabledName, false); } diff --git a/sharing/common/nearby_share_prefs.h b/sharing/common/nearby_share_prefs.h index cafc243c..6a96a864 100644 --- a/sharing/common/nearby_share_prefs.h +++ b/sharing/common/nearby_share_prefs.h @@ -63,7 +63,6 @@ ABSL_CONST_INIT extern const char kNearbySharingSchedulerUploadDeviceNameName[]; ABSL_CONST_INIT extern const char kNearbySharingSchedulerUploadLocalDeviceCertificatesName[]; ABSL_CONST_INIT extern const char kNearbySharingUsersName[]; -ABSL_CONST_INIT extern const char kNearbySharingIsReceivingName[]; ABSL_CONST_INIT extern const char kNearbySharingIsAnalyticsEnabledName[]; ABSL_CONST_INIT extern const char kNearbySharingIsAllContactsEnabledName[]; ABSL_CONST_INIT extern const char kNearbySharingAutoAppStartEnabledName[]; diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc index a6855b63..71cdade8 100644 --- a/sharing/nearby_sharing_service_impl.cc +++ b/sharing/nearby_sharing_service_impl.cc @@ -1315,9 +1315,6 @@ void NearbySharingServiceImpl::OnSettingChanged(absl::string_view key, } else if (key == prefs::kNearbySharingOnboardingCompleteName) { bool is_complete = data.value.as_bool; OnIsOnboardingCompleteChanged(is_complete); - } else if (key == prefs::kNearbySharingIsReceivingName) { - bool is_receiving = data.value.as_bool; - OnIsReceivingChanged(is_receiving); } } @@ -1380,15 +1377,6 @@ void NearbySharingServiceImpl::OnIsOnboardingCompleteChanged(bool is_complete) { } } -void NearbySharingServiceImpl::OnIsReceivingChanged(bool is_receiving) { - RunOnNearbySharingServiceThread( - "on_is_receiving_changed", [this, is_receiving]() { - NL_LOG(INFO) << __func__ << ": Nearby sharing receiving changed to " - << is_receiving; - InvalidateSurfaceState(); - }); -} - // NearbyShareCertificateManager::Observer: void NearbySharingServiceImpl::OnPublicCertificatesDownloaded() { if (!is_scanning_ || discovered_advertisements_to_retry_map_.empty()) { @@ -1605,10 +1593,8 @@ NearbySharingServiceImpl::GetReceiveCallbacksMapFromState( bool NearbySharingServiceImpl::IsVisibleInBackground( DeviceVisibility visibility) { - return visibility == DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS || - visibility == DeviceVisibility::DEVICE_VISIBILITY_SELECTED_CONTACTS || - visibility == DeviceVisibility::DEVICE_VISIBILITY_EVERYONE || - visibility == DeviceVisibility::DEVICE_VISIBILITY_SELF_SHARE; + return visibility != DeviceVisibility::DEVICE_VISIBILITY_HIDDEN && + visibility != DeviceVisibility::DEVICE_VISIBILITY_UNSPECIFIED; } std::optional> @@ -2062,13 +2048,6 @@ void NearbySharingServiceImpl::InvalidateReceiveSurfaceState() { } void NearbySharingServiceImpl::InvalidateAdvertisingState() { - if (!settings_->GetIsReceiving()) { - StopAdvertising(); - NL_VLOG(1) << __func__ - << ": Stopping advertising because receiving is disabled."; - return; - } - // Do not advertise on lock screen unless Self Share is enabled. if (is_screen_locked_ && !NearbyFlags::GetInstance().GetBoolFlag( @@ -2123,13 +2102,12 @@ void NearbySharingServiceImpl::InvalidateAdvertisingState() { return; } - if (!IsVisibleInBackground(settings_->GetVisibility()) && - foreground_receive_callbacks_map_.empty()) { + // We should only advertise if the user has set the visibility to something + // other than HIDDEN or UNSPECIFIED. + if (!IsVisibleInBackground(settings_->GetVisibility())) { StopAdvertising(); - NL_VLOG(1) - << __func__ - << ": Stopping advertising because no high power receive surface " - "is registered and device is visible to NO_ONE."; + NL_VLOG(1) << __func__ + << ": Stopping advertising because device is visible to NO_ONE."; return; } @@ -4366,11 +4344,8 @@ void NearbySharingServiceImpl::ResetAllSettings(bool logout) { bool is_temporarily_visible = settings_->GetIsTemporarilyVisible(); // When logged out the visibility can either be "everyone" or "hidden". If // the visibility wasn't already "always everyone", change it to "hidden". - if (visibility == DeviceVisibility::DEVICE_VISIBILITY_EVERYONE && - !is_temporarily_visible) { - settings_->SetIsReceiving(true); - } else { - settings_->SetIsReceiving(false); + if (visibility != DeviceVisibility::DEVICE_VISIBILITY_EVERYONE || + is_temporarily_visible) { settings_->SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_HIDDEN); } diff --git a/sharing/nearby_sharing_service_impl.h b/sharing/nearby_sharing_service_impl.h index 7e1ad266..9c026ccd 100644 --- a/sharing/nearby_sharing_service_impl.h +++ b/sharing/nearby_sharing_service_impl.h @@ -212,7 +212,6 @@ class NearbySharingServiceImpl void OnVisibilityChanged(proto::DeviceVisibility visibility); void OnAllowedContactsChanged(absl::Span allowed_contacts); void OnIsOnboardingCompleteChanged(bool is_complete); - void OnIsReceivingChanged(bool is_receiving); // NearbyShareCertificateManager::Observer: void OnPublicCertificatesDownloaded() override; diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc index fdee855c..5776994c 100644 --- a/sharing/nearby_sharing_service_impl_test.cc +++ b/sharing/nearby_sharing_service_impl_test.cc @@ -1936,9 +1936,7 @@ TEST_F(NearbySharingServiceImplTest, ::nearby::AccountManager::Account account; account.id = kTestAccountId; account_manager().SetAccount(account); - preference_manager().SetInteger( - prefs::kNearbySharingBackgroundVisibilityName, - static_cast(DeviceVisibility::DEVICE_VISIBILITY_SELECTED_CONTACTS)); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kBackground); @@ -1961,6 +1959,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, RegisterReceiveSurfaceTwiceSameCallbackKeepAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -1976,6 +1975,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, RegisterReceiveSurfaceTwiceKeepAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -1992,6 +1992,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, DataUsageChangedRegisterReceiveSurfaceRestartsAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); preference_manager().SetInteger( prefs::kNearbySharingDataUsageName, static_cast(DataUsage::OFFLINE_DATA_USAGE)); @@ -2142,6 +2143,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, NoNetworkRegisterReceiveSurfaceIsAdvertising) { MockTransferUpdateCallback callback; + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); EXPECT_EQ(result, NearbySharingService::StatusCodes::kOk); @@ -2178,6 +2180,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, WifiRegisterReceiveSurfaceIsAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2188,6 +2191,7 @@ TEST_F(NearbySharingServiceImplTest, WifiRegisterReceiveSurfaceIsAdvertising) { TEST_F(NearbySharingServiceImplTest, EthernetRegisterReceiveSurfaceIsAdvertising) { SetConnectionType(ConnectionType::kEthernet); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2198,6 +2202,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, ThreeGRegisterReceiveSurfaceIsAdvertising) { SetConnectionType(ConnectionType::k3G); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2210,6 +2215,7 @@ TEST_F(NearbySharingServiceImplTest, NoBluetoothWifiReceiveSurfaceIsAdvertising) { SetBluetoothIsPresent(false); SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2222,6 +2228,7 @@ TEST_F(NearbySharingServiceImplTest, NoBluetoothEthernetReceiveSurfaceIsAdvertising) { SetBluetoothIsPresent(false); SetConnectionType(ConnectionType::kEthernet); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2259,6 +2266,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, DisableFeatureReceiveSurfaceStopsAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2288,6 +2296,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, BackgroundReceiveSurfaceNoOneVisibilityNotAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_SELF_SHARE); preference_manager().SetInteger( prefs::kNearbySharingBackgroundVisibilityName, static_cast(DeviceVisibility::DEVICE_VISIBILITY_UNSPECIFIED)); @@ -2303,9 +2312,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, BackgroundReceiveSurfaceVisibilityToNoOneStopsAdvertising) { SetConnectionType(ConnectionType::kWifi); - preference_manager().SetInteger( - prefs::kNearbySharingBackgroundVisibilityName, - static_cast(DeviceVisibility::DEVICE_VISIBILITY_SELECTED_CONTACTS)); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_SELECTED_CONTACTS); FlushTesting(); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( @@ -2315,18 +2322,16 @@ TEST_F(NearbySharingServiceImplTest, preference_manager().SetInteger( prefs::kNearbySharingBackgroundVisibilityName, - static_cast(DeviceVisibility::DEVICE_VISIBILITY_UNSPECIFIED)); + static_cast(DeviceVisibility::DEVICE_VISIBILITY_HIDDEN)); FlushTesting(); EXPECT_FALSE(fake_nearby_connections_manager_->IsAdvertising()); EXPECT_FALSE(fake_nearby_connections_manager_->is_shutdown()); } TEST_F(NearbySharingServiceImplTest, - BackgroundReceiveSurfaceVisibilityToSelectedStartsAdvertising) { + BackgroundReceiveSurfaceVisibilityToAllContactsStartsAdvertising) { SetConnectionType(ConnectionType::kWifi); - preference_manager().SetInteger( - prefs::kNearbySharingBackgroundVisibilityName, - static_cast(DeviceVisibility::DEVICE_VISIBILITY_UNSPECIFIED)); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_UNSPECIFIED); FlushTesting(); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( @@ -2335,9 +2340,7 @@ TEST_F(NearbySharingServiceImplTest, EXPECT_FALSE(fake_nearby_connections_manager_->IsAdvertising()); EXPECT_FALSE(fake_nearby_connections_manager_->is_shutdown()); - preference_manager().SetInteger( - prefs::kNearbySharingBackgroundVisibilityName, - static_cast(DeviceVisibility::DEVICE_VISIBILITY_SELECTED_CONTACTS)); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); FlushTesting(); EXPECT_TRUE(fake_nearby_connections_manager_->IsAdvertising()); } @@ -2400,6 +2403,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, UnregisterReceiveSurfaceStopsAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2416,6 +2420,7 @@ TEST_F(NearbySharingServiceImplTest, UnregisterReceiveSurfaceStopsAdvertising) { TEST_F(NearbySharingServiceImplTest, UnregisterReceiveSurfaceDifferentCallbackKeepAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -2454,6 +2459,7 @@ TEST_F(NearbySharingServiceImplTest, EXPECT_CALL(callback, OnTransferUpdate(testing::_, testing::_, testing::_)) .Times(0); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); SetUpForegroundReceiveSurface(callback); EXPECT_CALL(*mock_app_info_, SetActiveFlag()); Shutdown(); @@ -2475,6 +2481,7 @@ TEST_F(NearbySharingServiceImplTest, /*expected_number_of_calls=*/1u); SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); NiceMock callback; EXPECT_CALL(callback, OnTransferUpdate(testing::_, testing::_, testing::_)) .WillOnce(testing::Invoke( @@ -3362,6 +3369,7 @@ TEST_F(NearbySharingServiceImplTest, /*expected_number_of_calls=*/1u); SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_EVERYONE); NiceMock callback; SetUpForegroundReceiveSurface(callback); @@ -4638,6 +4646,7 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, ScreenLocksDuringAdvertising) { SetConnectionType(ConnectionType::kWifi); + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); @@ -4945,7 +4954,6 @@ TEST_F(NearbySharingServiceImplTest, LogoutShouldSetValidVisibility) { EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout)); // Set visibility. - service_->GetSettings()->SetIsReceiving(true); service_->GetSettings()->SetVisibility( DeviceVisibility::DEVICE_VISIBILITY_SELF_SHARE); @@ -4957,7 +4965,8 @@ TEST_F(NearbySharingServiceImplTest, LogoutShouldSetValidVisibility) { }); EXPECT_TRUE(logout_notification.WaitForNotificationWithTimeout(kWaitTimeout)); EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout)); - EXPECT_FALSE(service_->GetSettings()->GetIsReceiving()); + EXPECT_EQ(service_->GetSettings()->GetVisibility(), + DeviceVisibility::DEVICE_VISIBILITY_HIDDEN); // Login user. absl::Notification login2_notification; @@ -4972,7 +4981,6 @@ TEST_F(NearbySharingServiceImplTest, LogoutShouldSetValidVisibility) { EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout)); // Set visibility. - service_->GetSettings()->SetIsReceiving(true); service_->GetSettings()->SetVisibility( DeviceVisibility::DEVICE_VISIBILITY_EVERYONE); @@ -4985,7 +4993,6 @@ TEST_F(NearbySharingServiceImplTest, LogoutShouldSetValidVisibility) { EXPECT_TRUE( logout2_notification.WaitForNotificationWithTimeout(kWaitTimeout)); EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout)); - EXPECT_TRUE(service_->GetSettings()->GetIsReceiving()); EXPECT_EQ(service_->GetSettings()->GetVisibility(), DeviceVisibility::DEVICE_VISIBILITY_EVERYONE); EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout)); @@ -5028,8 +5035,8 @@ TEST_F(NearbySharingServiceImplTest, LoginAndLogoutNoStopRunningSurfaces) { TEST_F(NearbySharingServiceImplTest, IsReceivingEnabledWithRegisterReceiveSurfaceForeground) { + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS); MockTransferUpdateCallback callback; - service_->GetSettings()->SetIsReceiving(true); NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); EXPECT_EQ(result, NearbySharingService::StatusCodes::kOk); @@ -5040,7 +5047,6 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, IsReceivingDisabledWithRegisterReceiveSurfaceForeground) { MockTransferUpdateCallback callback; - service_->GetSettings()->SetIsReceiving(false); NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kForeground); EXPECT_EQ(result, NearbySharingService::StatusCodes::kOk); @@ -5053,7 +5059,6 @@ TEST_F(NearbySharingServiceImplTest, MockTransferUpdateCallback callback; service_->GetSettings()->SetVisibility( DeviceVisibility::DEVICE_VISIBILITY_SELF_SHARE); - service_->GetSettings()->SetIsReceiving(true); NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kBackground); EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout)); @@ -5065,7 +5070,6 @@ TEST_F(NearbySharingServiceImplTest, TEST_F(NearbySharingServiceImplTest, IsReceivingDisabledWithRegisterReceiveSurfaceBackground) { MockTransferUpdateCallback callback; - service_->GetSettings()->SetIsReceiving(false); NearbySharingService::StatusCodes result = RegisterReceiveSurface( &callback, NearbySharingService::ReceiveSurfaceState::kBackground); EXPECT_EQ(result, NearbySharingService::StatusCodes::kOk); @@ -5073,6 +5077,16 @@ TEST_F(NearbySharingServiceImplTest, UnregisterReceiveSurface(&callback); } +TEST_F(NearbySharingServiceImplTest, NoAdvertisingWhenHidden) { + MockTransferUpdateCallback callback; + SetVisibility(DeviceVisibility::DEVICE_VISIBILITY_HIDDEN); + NearbySharingService::StatusCodes result = RegisterReceiveSurface( + &callback, NearbySharingService::ReceiveSurfaceState::kForeground); + EXPECT_EQ(result, NearbySharingService::StatusCodes::kOk); + EXPECT_FALSE(fake_nearby_connections_manager_->IsAdvertising()); + UnregisterReceiveSurface(&callback); +} + TEST_F(NearbySharingServiceImplTest, RemoveIncomingPayloads) { NearbyFlags::GetInstance().OverrideBoolFlagValue( config_package_nearby::nearby_sharing_feature:: diff --git a/sharing/nearby_sharing_settings.cc b/sharing/nearby_sharing_settings.cc index 8b3b1512..b3a58aae 100644 --- a/sharing/nearby_sharing_settings.cc +++ b/sharing/nearby_sharing_settings.cc @@ -475,8 +475,6 @@ void NearbyShareSettings::OnPreferenceChanged(absl::string_view key) { NotifyAllObservers(key, Observer::Data(GetAllowedContacts())); } else if (key == prefs::kNearbySharingOnboardingCompleteName) { NotifyAllObservers(key, Observer::Data(IsOnboardingComplete())); - } else if (key == prefs::kNearbySharingIsReceivingName) { - NotifyAllObservers(key, Observer::Data(GetIsReceiving())); } else if (key == prefs::kNearbySharingCustomSavePath) { NotifyAllObservers(key, Observer::Data(GetCustomSavePath())); } else { @@ -522,18 +520,6 @@ void NearbyShareSettings::ProcessFastInitiationNotificationParentPrefChanged( : FastInitiationNotificationState::DISABLED_BY_FEATURE_FAST_INIT); } -bool NearbyShareSettings::GetIsReceiving() { - MutexLock lock(&mutex_); - return preference_manager_.GetBoolean(prefs::kNearbySharingIsReceivingName, - true); -} - -void NearbyShareSettings::SetIsReceiving(bool is_receiving) const { - MutexLock lock(&mutex_); - preference_manager_.SetBoolean(prefs::kNearbySharingIsReceivingName, - is_receiving); -} - bool NearbyShareSettings::GetIsAnalyticsEnabled() { MutexLock lock(&mutex_); return preference_manager_.GetBoolean( diff --git a/sharing/nearby_sharing_settings_test.cc b/sharing/nearby_sharing_settings_test.cc index fd4c2175..43c256c1 100644 --- a/sharing/nearby_sharing_settings_test.cc +++ b/sharing/nearby_sharing_settings_test.cc @@ -68,8 +68,6 @@ class FakeNearbyShareSettingsObserver : public NearbyShareSettings::Observer { visibility_ = static_cast(data.value.as_int64); } else if (key == prefs::kNearbySharingOnboardingCompleteName) { is_onboarding_complete_ = data.value.as_bool; - } else if (key == prefs::kNearbySharingIsReceivingName) { - is_receiving_ = data.value.as_bool; } else if (key == prefs::kNearbySharingAllowedContactsName) { allowed_contacts_.clear(); for (auto& allowed_contact : data.value.as_string_array) { @@ -145,7 +143,6 @@ class FakeNearbyShareSettingsObserver : public NearbyShareSettings::Observer { bool is_fast_initiation_notification_hardware_supported_ ABSL_GUARDED_BY(mutex_) = false; bool is_onboarding_complete_ ABSL_GUARDED_BY(mutex_) = false; - bool is_receiving_ ABSL_GUARDED_BY(mutex_) = false; std::string device_name_ ABSL_GUARDED_BY(mutex_) = "uncalled"; std::string custom_save_path_ ABSL_GUARDED_BY(mutex_); DataUsage data_usage_ ABSL_GUARDED_BY(mutex_) = DataUsage::UNKNOWN_DATA_USAGE; diff --git a/sharing/proto/enums.proto b/sharing/proto/enums.proto index d350febd..bfc59c6c 100644 --- a/sharing/proto/enums.proto +++ b/sharing/proto/enums.proto @@ -57,5 +57,5 @@ enum DeviceVisibility { DEVICE_VISIBILITY_EVERYONE = 4; // TODO(b/251499089): Combine kAllContacts and kSelectedContacts to kContacts // The user is only visible to selected contacts. - DEVICE_VISIBILITY_SELECTED_CONTACTS = 5; + DEVICE_VISIBILITY_SELECTED_CONTACTS = 5 [deprecated = true]; }