[Nearby] Save contact visibility once on exit

The contact visibility page was updating the visibility pref and
making an api request to sync the allowed contacts list every time
the controls on the page were pressed/toggled. This CL instead
saves the page state once when the page closes.

Fixed: 1131269
Change-Id: Iaf6e5138b029450df083179994cba7f67ee0f5c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2606716
Commit-Queue: Curt Clemens <cclem@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839809}

chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.html

@@ -392,8 +392,7 @@
                       <cr-toggle class="contact-toggle"
                           checked="{{item.checked}}"
                           disabled="[[!isVisibility_(
-                            selectedVisibility,'some')]]"
-                          on-click="syncContactToggleState_">
+                            selectedVisibility,'some')]]">
                       </cr-toggle>
                     </template>
                   </div>

chrome/browser/resources/nearby_share/shared/nearby_contact_visibility.js

@@ -140,7 +140,6 @@ Polymer({
 
   observers: [
     'settingsChanged_(settings.visibility)',
-    'selectedVisibilityChanged_(selectedVisibility)',
   ],
 
   /** @override */
@@ -267,23 +266,6 @@ Polymer({
     clearTimeout(this.downloadTimeoutId_);
   },
 
-  /**
-   * Sync the latest contact toggle states and update allowedContacts through
-   * the contact manager.
-   * @private
-   */
-  syncContactToggleState_() {
-    const allowedContacts = [];
-    if (this.contacts) {
-      for (const contact of this.contacts) {
-        if (contact.checked) {
-          allowedContacts.push(contact.id);
-        }
-      }
-    }
-    this.contactManager_.setAllowedContacts(allowedContacts);
-  },
-
   /**
    * TODO(crbug.com/1128256): Remove after specs/a11y.
    * Call from the JS debug console to test scrolling.
@@ -341,17 +323,6 @@ Polymer({
     }
   },
 
-  /**
-   * @param {string} selectedVisibility
-   * @private
-   */
-  selectedVisibilityChanged_(selectedVisibility) {
-    const visibility = visibilityStringToValue(this.selectedVisibility);
-    if (visibility) {
-      this.set('settings.visibility', visibility);
-    }
-  },
-
   /**
    * @param {string} contactsState
    * @return {boolean} true when the radio group should be disabled
@@ -532,5 +503,26 @@ Polymer({
         return '';
     }
   },
+
+  /**
+   * Save visibility setting and sync allowed contacts with contact manager.
+   * @public
+   */
+  saveVisibilityAndAllowedContacts() {
+    const visibility = visibilityStringToValue(this.selectedVisibility);
+    if (visibility) {
+      this.set('settings.visibility', visibility);
+    }
+
+    const allowedContacts = [];
+    if (this.contacts) {
+      for (const contact of this.contacts) {
+        if (contact.checked) {
+          allowedContacts.push(contact.id);
+        }
+      }
+    }
+    this.contactManager_.setAllowedContacts(allowedContacts);
+  },
 });
 })();

chrome/browser/resources/nearby_share/shared/nearby_visibility_page.js

@@ -33,6 +33,9 @@ Polymer({
   listeners: {'next': 'onNext_', 'manage-contacts': 'onManageContacts_'},
 
   onNext_() {
+    const contactVisibility = /** @type {NearbyContactVisibilityElement} */
+        (this.$.contactVisibility);
+    contactVisibility.saveVisibilityAndAllowedContacts();
     this.set('settings.enabled', true);
     this.fire('onboarding-complete');
   },

chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.html

@@ -48,7 +48,8 @@
         $i18n{nearbyShareVisibilityPageSubtitle}
       </h2>
       <div slot="body">
-        <nearby-contact-visibility settings="{{settings}}">
+        <nearby-contact-visibility id="contactVisibility"
+            settings="{{settings}}">
         </nearby-contact-visibility>
       </div>
       <div class="layout horizontal center" slot="button-container">

chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.js

@@ -20,6 +20,9 @@ Polymer({
 
   /** @private */
   onDoneClick_() {
+    const contactVisibility = /** @type {NearbyContactVisibilityElement} */
+        (this.$.contactVisibility);
+    contactVisibility.saveVisibilityAndAllowedContacts();
     const dialog = /** @type {!CrDialogElement} */ (this.$.dialog);
     if (dialog.open) {
       dialog.close();

chrome/test/data/webui/nearby_share/shared/fake_nearby_contact_manager.js

@@ -15,8 +15,8 @@ cr.define('nearby_share', function() {
     constructor() {
       /** @type {?Array<!nearbyShare.mojom.ContactRecord>} */
       this.contactRecords = null;
-      /** @private {!Array<!string>} */
-      this.allowedContacts_ = [];
+      /** @type {!Array<!string>} */
+      this.allowedContacts = [];
       /** @private {number} */
       this.numUnreachable_ = 3;
       /** @private {?nearbyShare.mojom.DownloadContactsObserverInterface} */
@@ -44,7 +44,7 @@ cr.define('nearby_share', function() {
      * @param {!Array<!string>} allowedContacts
      */
     setAllowedContacts(allowedContacts) {
-      this.allowedContacts_ = allowedContacts;
+      this.allowedContacts = allowedContacts;
     }
 
     /**
@@ -73,7 +73,7 @@ cr.define('nearby_share', function() {
           ]
         }
       ];
-      this.allowedContacts_ = ['1'];
+      this.allowedContacts = ['1'];
     }
 
     failDownload() {
@@ -82,7 +82,7 @@ cr.define('nearby_share', function() {
 
     completeDownload() {
       this.observer_.onContactsDownloaded(
-          this.allowedContacts_, this.contactRecords || [],
+          this.allowedContacts, this.contactRecords || [],
           /*num_unreachable_contacts_filtered_out=*/ this.numUnreachable_);
     }
   }

chrome/test/data/webui/nearby_share/shared/nearby_contact_visibility_test.js

@@ -284,4 +284,43 @@ suite('nearby-contact-visibility', () => {
 
         assertFalse(isUnreachableMessageVisible());
       });
+
+  test(
+      'Save persists visibility setting and allowed contacts',
+      async function() {
+        fakeContactManager.setupContactRecords();
+        fakeContactManager.setNumUnreachable(0);
+        fakeContactManager.completeDownload();
+        visibilityElement.set(
+            'settings.visibility', nearbyShare.mojom.Visibility.kAllContacts);
+        await test_util.waitAfterNextRender(visibilityElement);
+
+        // visibility setting is not immediately updated
+        visibilityElement.$$('#someContacts').click();
+        await test_util.waitAfterNextRender(visibilityElement);
+        assertTrue(areContactCheckBoxesVisible());
+        assertEquals(
+            visibilityElement.get('settings.visibility'),
+            nearbyShare.mojom.Visibility.kAllContacts);
+
+        // allow only contact 2, check that allowed contacts are not yet pushed
+        // to the contact manager
+        fakeContactManager.setAllowedContacts(['1']);
+        for (let i = 0; i < visibilityElement.contacts.length; ++i) {
+          visibilityElement.set(
+              ['contacts', i, 'checked'],
+              visibilityElement.contacts[i].id === '2');
+        }
+        await test_util.waitAfterNextRender(visibilityElement);
+        assertEquals(fakeContactManager.allowedContacts.length, 1);
+        assertEquals(fakeContactManager.allowedContacts[0], '1');
+
+        // after save, ui state is persisted
+        visibilityElement.saveVisibilityAndAllowedContacts();
+        assertEquals(
+            visibilityElement.get('settings.visibility'),
+            nearbyShare.mojom.Visibility.kSelectedContacts);
+        assertEquals(fakeContactManager.allowedContacts.length, 1);
+        assertEquals(fakeContactManager.allowedContacts[0], '2');
+      });
 });