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

internal shuffle of preferences

Browse Source 
PiperOrigin-RevId: 648871255
This commit is contained in:
Anay Wadhera
2024-07-02 16:02:48 -07:00
committed by Copybara-Service
parent d81ced95c7
commit 6cdc8a4bda
2 changed files with 0 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/nearby_sharing_service_impl.cc
-8
View File
@@ -4053,14 +4053,6 @@ void NearbySharingServiceImpl::ResetAllSettings(bool logout) {
settings_->OnLocalDeviceDataChanged(/*did_device_name_change=*/true,
/*did_full_name_change=*/false,
/*did_icon_url_change=*/false);
// Set default visibility to kAllContacts if logged-in and onboarding.
if (!settings_->IsOnboardingComplete()) {
NL_LOG(INFO) << __func__
<< ": Set visibility to kAllContacts since user is "
"logged-in during onboarding";
settings_->SetVisibility(
DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS);
}
}
// Start services again.
sharing/nearby_sharing_service_impl_test.cc
-97
View File
@@ -447,9 +447,6 @@ class NearbySharingServiceImplTest : public testing::Test {
}
void SetIsEnabled(bool is_enabled) {
if (is_enabled) {
service_->GetSettings()->SetIsOnboardingComplete(is_enabled, []() {});
}
service_->GetSettings()->SetEnabled(is_enabled);
FlushTesting();
}
@@ -4830,100 +4827,6 @@ TEST_F(NearbySharingServiceImplTest, LoginAndLogoutShouldResetSettings) {
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
}
TEST_F(NearbySharingServiceImplTest,
VisibilityShouldSetAsAllContactsAfterLoginSuccessDuringOnBoarding) {
SetConnectionType(ConnectionType::kWifi);
service_->GetSettings()->SetIsOnboardingComplete(false, []() {});
service_->GetSettings()->SetVisibility(
DeviceVisibility::DEVICE_VISIBILITY_HIDDEN);
EXPECT_EQ(service_->GetSettings()->GetVisibility(),
DeviceVisibility::DEVICE_VISIBILITY_HIDDEN);
// Create account.
::nearby::AccountManager::Account account;
account.id = kTestAccountId;
// Login user.
absl::Notification login_notification;
account_manager().SetAccount(account);
service_->GetAccountManager()->Login(
[&](AccountManager::Account account) {
EXPECT_EQ(account.id, kTestAccountId);
login_notification.Notify();
},
[](absl::Status status) {});
ASSERT_TRUE(login_notification.WaitForNotificationWithTimeout(kWaitTimeout));
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
EXPECT_EQ(service_->GetSettings()->GetVisibility(),
DeviceVisibility::DEVICE_VISIBILITY_ALL_CONTACTS);
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
}
TEST_F(NearbySharingServiceImplTest, LogoutShouldNotResetOnboarding) {
SetConnectionType(ConnectionType::kWifi);
// Used to check whether the setting is cleared after login.
service_->GetSettings()->SetIsOnboardingComplete(false, []() {});
// Create account.
::nearby::AccountManager::Account account;
account.id = kTestAccountId;
// Login user.
absl::Notification login_notification;
account_manager().SetAccount(account);
service_->GetAccountManager()->Login(
[&](AccountManager::Account account) {
EXPECT_EQ(account.id, kTestAccountId);
login_notification.Notify();
},
[](absl::Status status) {});
ASSERT_TRUE(login_notification.WaitForNotificationWithTimeout(kWaitTimeout));
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
EXPECT_FALSE(service_->GetSettings()->IsOnboardingComplete());
// Logout user.
absl::Notification logout_notification;
service_->GetAccountManager()->Logout([&](absl::Status status) {
EXPECT_TRUE(status.ok());
logout_notification.Notify();
});
EXPECT_TRUE(logout_notification.WaitForNotificationWithTimeout(kWaitTimeout));
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
EXPECT_FALSE(service_->GetSettings()->IsOnboardingComplete());
// Complete onboarding.
service_->GetSettings()->SetIsOnboardingComplete(true, []() {});
// Login user.
absl::Notification login2_notification;
account_manager().SetAccount(account);
service_->GetAccountManager()->Login(
[&](AccountManager::Account account) {
EXPECT_EQ(account.id, kTestAccountId);
login2_notification.Notify();
},
[](absl::Status status) {});
ASSERT_TRUE(login2_notification.WaitForNotificationWithTimeout(kWaitTimeout));
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
EXPECT_TRUE(service_->GetSettings()->IsOnboardingComplete());
// Logout user.
absl::Notification logout2_notification;
service_->GetAccountManager()->Logout([&](absl::Status status) {
EXPECT_TRUE(status.ok());
logout2_notification.Notify();
});
EXPECT_TRUE(
logout2_notification.WaitForNotificationWithTimeout(kWaitTimeout));
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
EXPECT_TRUE(service_->GetSettings()->IsOnboardingComplete());
EXPECT_TRUE(sharing_service_task_runner_->SyncWithTimeout(kTaskWaitTimeout));
}
TEST_F(NearbySharingServiceImplTest, LogoutShouldSetValidVisibility) {
SetConnectionType(ConnectionType::kWifi);