From 81abdf24465d84e2304b8245d2f51400436ce2e8 Mon Sep 17 00:00:00 2001 From: maxbogue Date: Thu, 10 Sep 2015 10:40:19 -0700 Subject: [Sync] Clean up PSS boolean getters for consistency. When cleaning up ProfileSyncServiceAndroid I noticed these inconsistencies but it seemed like PSS was the one that should be changed, not PSSA. Renames: - EncryptEverythingEnabled -> IsEncryptEverythingEnabled - EncryptEverythingAllowed -> IsEncryptEverythingAllowed - FirstSetupInProgress -> IsFirstSetupInProgress - backend_initialized -> IsBackendInitialized - setup_in_progress -> IsSetupInProgress BUG=497518 TBR=rogerta,stevenjb,pam,sdefresne Review URL: https://codereview.chromium.org/1321903005 Cr-Commit-Position: refs/heads/master@{#348178} --- sync/android/java/src/org/chromium/sync/PassphraseType.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sync/android') diff --git a/sync/android/java/src/org/chromium/sync/PassphraseType.java b/sync/android/java/src/org/chromium/sync/PassphraseType.java index 8ef3d5a..8aa5879 100644 --- a/sync/android/java/src/org/chromium/sync/PassphraseType.java +++ b/sync/android/java/src/org/chromium/sync/PassphraseType.java @@ -74,15 +74,15 @@ public enum PassphraseType implements Parcelable { /** * Get the types that are allowed to be enabled from the current type. * - * @param encryptEverythingAllowed Whether encrypting all data is allowed. + * @param isEncryptEverythingAllowed Whether encrypting all data is allowed. */ - public Set getAllowedTypes(boolean encryptEverythingAllowed) { + public Set getAllowedTypes(boolean isEncryptEverythingAllowed) { Set allowedTypes = new HashSet<>(); switch (this) { case IMPLICIT_PASSPHRASE: // Intentional fall through. case KEYSTORE_PASSPHRASE: allowedTypes.add(this); - if (encryptEverythingAllowed) { + if (isEncryptEverythingAllowed) { allowedTypes.add(CUSTOM_PASSPHRASE); } break; -- cgit v1.1