diff options
Diffstat (limited to 'input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill')
4 files changed, 31 insertions, 31 deletions
diff --git a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AuthActivity.java b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AuthActivity.java index e1660b7c..c5d32eaf 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AuthActivity.java +++ b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AuthActivity.java @@ -15,6 +15,13 @@ */ package com.example.android.autofill.service; +import static android.view.autofill.AutofillManager.EXTRA_ASSIST_STRUCTURE; +import static android.view.autofill.AutofillManager.EXTRA_AUTHENTICATION_RESULT; + +import static com.example.android.autofill.service.util.Util.EXTRA_DATASET_NAME; +import static com.example.android.autofill.service.util.Util.EXTRA_FOR_RESPONSE; +import static com.example.android.autofill.service.util.Util.logw; + import android.app.PendingIntent; import android.app.assist.AssistStructure; import android.content.Context; @@ -51,13 +58,6 @@ import com.google.gson.GsonBuilder; import java.util.HashMap; import java.util.List; -import static android.view.autofill.AutofillManager.EXTRA_ASSIST_STRUCTURE; -import static android.view.autofill.AutofillManager.EXTRA_AUTHENTICATION_RESULT; -import static com.example.android.autofill.service.util.Util.EXTRA_DATASET_NAME; -import static com.example.android.autofill.service.util.Util.EXTRA_FOR_RESPONSE; -import static com.example.android.autofill.service.util.Util.logw; - - /** * This Activity controls the UI for logging in to the Autofill service. * It is launched when an Autofill Response or specific Dataset within the Response requires @@ -70,7 +70,7 @@ public class AuthActivity extends AppCompatActivity { private LocalAutofillDataSource mLocalAutofillDataSource; private DigitalAssetLinksRepository mDalRepository; - private EditText mMasterPassword; + private EditText mMainPassword; private DatasetAdapter mDatasetAdapter; private ResponseAdapter mResponseAdapter; private ClientViewMetadata mClientViewMetadata; @@ -107,7 +107,7 @@ public class AuthActivity extends AppCompatActivity { mLocalAutofillDataSource = LocalAutofillDataSource.getInstance(sharedPreferences, autofillDao, new AppExecutors()); mDalRepository = DigitalAssetLinksRepository.getInstance(getPackageManager()); - mMasterPassword = findViewById(R.id.master_password); + mMainPassword = findViewById(R.id.main_password); mPackageName = getPackageName(); mPreferences = MyPreferences.getInstance(this); findViewById(R.id.login).setOnClickListener((view) -> login()); @@ -118,8 +118,8 @@ public class AuthActivity extends AppCompatActivity { } private void login() { - Editable password = mMasterPassword.getText(); - String correctPassword = MyPreferences.getInstance(AuthActivity.this).getMasterPassword(); + Editable password = mMainPassword.getText(); + String correctPassword = MyPreferences.getInstance(AuthActivity.this).getMainPassword(); if (password.toString().equals(correctPassword)) { onSuccess(); } else { diff --git a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java index 8314eb30..3da54c1d 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java +++ b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java @@ -44,7 +44,7 @@ public final class AutofillHintProperties { } /** - * Generates dummy autofill field data that is relevant to the autofill hint. + * Generates placeholder autofill field data that is relevant to the autofill hint. */ public FilledAutofillField generateFakeField(int seed, String datasetId) { return mFakeFieldGenerator.generate(seed, datasetId); diff --git a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/MyPreferences.java b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/MyPreferences.java index 6a723f0d..f006b2db 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/MyPreferences.java +++ b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/MyPreferences.java @@ -26,7 +26,7 @@ import com.example.android.autofill.service.util.Util; public class MyPreferences { private static final String RESPONSE_AUTH_KEY = "response_auth"; private static final String DATASET_AUTH_KEY = "dataset_auth"; - private static final String MASTER_PASSWORD_KEY = "master_password"; + private static final String MAIN_PASSWORD_KEY = "main_password"; private static final String LOGGING_LEVEL = "logging_level"; private static final String DAL_CHECK_REQUIRED = "dal_check_required"; private static final String NUMBER_DATASETS = "number_datasets"; @@ -74,21 +74,21 @@ public class MyPreferences { } /** - * Gets autofill master username. + * Gets autofill main username. */ - public String getMasterPassword() { - return mPrefs.getString(MASTER_PASSWORD_KEY, null); + public String getMainPassword() { + return mPrefs.getString(MAIN_PASSWORD_KEY, null); } /** - * Sets autofill master password. + * Sets autofill main password. */ - public void setMasterPassword(@NonNull String masterPassword) { - mPrefs.edit().putString(MASTER_PASSWORD_KEY, masterPassword).apply(); + public void setMainPassword(@NonNull String mainPassword) { + mPrefs.edit().putString(MAIN_PASSWORD_KEY, mainPassword).apply(); } public void clearCredentials() { - mPrefs.edit().remove(MASTER_PASSWORD_KEY).apply(); + mPrefs.edit().remove(MAIN_PASSWORD_KEY).apply(); } public Util.LogLevel getLoggingLevel() { diff --git a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java index 500ceeca..9b4916fd 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java +++ b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/settings/SettingsActivity.java @@ -15,6 +15,12 @@ */ package com.example.android.autofill.service.settings; +import static com.example.android.autofill.service.util.Util.DalCheckRequirement.AllUrls; +import static com.example.android.autofill.service.util.Util.DalCheckRequirement.Disabled; +import static com.example.android.autofill.service.util.Util.DalCheckRequirement.LoginOnly; +import static com.example.android.autofill.service.util.Util.logd; +import static com.example.android.autofill.service.util.Util.logw; + import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -56,12 +62,6 @@ import com.google.gson.GsonBuilder; import java.util.List; -import static com.example.android.autofill.service.util.Util.DalCheckRequirement.AllUrls; -import static com.example.android.autofill.service.util.Util.DalCheckRequirement.Disabled; -import static com.example.android.autofill.service.util.Util.DalCheckRequirement.LoginOnly; -import static com.example.android.autofill.service.util.Util.logd; -import static com.example.android.autofill.service.util.Util.logw; - public class SettingsActivity extends AppCompatActivity { private static final String TAG = "SettingsActivity"; private static final int REQUEST_CODE_SET_DEFAULT = 1; @@ -111,7 +111,7 @@ public class SettingsActivity extends AppCompatActivity { R.id.settings_auth_credentials_label, R.id.settings_auth_credentials_icon, (view) -> { - if (mPreferences.getMasterPassword() != null) { + if (mPreferences.getMainPassword() != null) { buildCurrentCredentialsDialog().show(); } else { buildNewCredentialsDialog().show(); @@ -258,7 +258,7 @@ public class SettingsActivity extends AppCompatActivity { final EditText currentPasswordField = LayoutInflater .from(SettingsActivity.this) .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) - .findViewById(R.id.master_password_field); + .findViewById(R.id.main_password_field); return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_current_password) .setView(currentPasswordField) @@ -266,7 +266,7 @@ public class SettingsActivity extends AppCompatActivity { @Override public void onClick(DialogInterface dialog, int which) { String password = currentPasswordField.getText().toString(); - if (mPreferences.getMasterPassword() + if (mPreferences.getMainPassword() .equals(password)) { buildNewCredentialsDialog().show(); dialog.dismiss(); @@ -280,13 +280,13 @@ public class SettingsActivity extends AppCompatActivity { final EditText newPasswordField = LayoutInflater .from(SettingsActivity.this) .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) - .findViewById(R.id.master_password_field); + .findViewById(R.id.main_password_field); return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_new_password) .setView(newPasswordField) .setPositiveButton(R.string.settings_ok, (dialog, which) -> { String password = newPasswordField.getText().toString(); - mPreferences.setMasterPassword(password); + mPreferences.setMainPassword(password); dialog.dismiss(); }) .create(); |