diff options
Diffstat (limited to 'input/autofill')
24 files changed, 78 insertions, 78 deletions
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java index ddc57988..1210c3ac 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java @@ -93,7 +93,7 @@ public class BadViewStructureCreationSignInActivity extends AppCompatActivity { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Placeholder implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ public boolean isValidCredentials(String username, String password) { diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java index 9f28912f..583e1e27 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java @@ -100,7 +100,7 @@ public class CallbackLessAutoCompleteSignInActivity extends AppCompatActivity { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Placeholder implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ public boolean isValidCredentials(String username, String password) { diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java index 089c6b2d..30991be4 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java @@ -110,7 +110,7 @@ public class StandardAutoCompleteSignInActivity extends AppCompatActivity { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Placeholder implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ public boolean isValidCredentials(String username, String password) { diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java index 3e3b5e9f..48b9522f 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java @@ -83,7 +83,7 @@ public class StandardSignInActivity extends AppCompatActivity { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Placeholder implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ public boolean isValidCredentials(String username, String password) { diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java index baafbf75..0c31a45d 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java @@ -93,7 +93,7 @@ public class VirtualSignInActivity extends AppCompatActivity { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Placeholder implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ public boolean isValidCredentials(String username, String password) { diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java index d55db82d..eba4864a 100644 --- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java +++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java @@ -38,7 +38,7 @@ import com.example.android.autofill.app.view.autofillable.CustomVirtualViewCompa * <p>Useful to test an Autofill service that supports Compatibility Mode. * - * <p><b>Note: </b>you must whitelist this app's package for compatibility mode. For exmaple, in + * <p><b>Note: </b>you must allowlist this app's package for compatibility mode. For exmaple, in * a UNIX-like OS such as Linux, you can run: * * <pre> @@ -111,7 +111,7 @@ public class VirtualCompatModeSignInActivity extends AppCompatActivity { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Placeholder implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ public boolean isValidCredentials(String username, String password) { 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(); diff --git a/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_auth_activity.xml b/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_auth_activity.xml index 844ea0a6..32cb5923 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_auth_activity.xml +++ b/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_auth_activity.xml @@ -28,12 +28,12 @@ tools:context="com.example.android.autofill.service.AuthActivity"> <TextView - android:id="@+id/master_login_header" + android:id="@+id/main_login_header" style="@style/TextAppearance.AppCompat.Large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/spacing_normal" - android:text="@string/autofill_master_login_label" + android:text="@string/autofill_main_login_label" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -47,15 +47,15 @@ android:layout_marginEnd="@dimen/spacing_normal" android:layout_marginStart="@dimen/spacing_normal" android:layout_marginTop="@dimen/spacing_large" - android:labelFor="@+id/master_password" + android:labelFor="@+id/main_password" android:text="@string/auth_password_label" - app:layout_constraintEnd_toStartOf="@+id/master_password" + app:layout_constraintEnd_toStartOf="@+id/main_password" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/master_login_header" /> + app:layout_constraintTop_toBottomOf="@+id/main_login_header" /> <EditText - android:id="@+id/master_password" + android:id="@+id/main_password" android:layout_width="@dimen/text_field_width" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/spacing_normal" @@ -80,7 +80,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/master_password" /> + app:layout_constraintTop_toBottomOf="@+id/main_password" /> <TextView android:id="@+id/login" diff --git a/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml b/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml index a84e45ff..19a17332 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml +++ b/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml @@ -14,7 +14,7 @@ * limitations under the License. --> <EditText xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/master_password_field" + android:id="@+id/main_password_field" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/spacing_normal" diff --git a/input/autofill/AutofillFramework/afservice/src/main/res/values/strings.xml b/input/autofill/AutofillFramework/afservice/src/main/res/values/strings.xml index e7b1f880..3729f880 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/res/values/strings.xml +++ b/input/autofill/AutofillFramework/afservice/src/main/res/values/strings.xml @@ -62,7 +62,7 @@ <string name="settings_auth_enter_new_password">Enter new password</string> <string name="settings_auth_change_credentials_title">Change credentials</string> <string name="settings_number_of_datasets_label">Number of Datasets</string> - <string name="autofill_master_login_label">Autofill Master Login</string> + <string name="autofill_main_login_label">Autofill Main Login</string> <string name="auth_password_label">Password</string> <string name="auth_cancel">Cancel</string> <string name="auth_login_label">Login</string> diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardAutoCompleteSignInActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardAutoCompleteSignInActivity.kt index 2e154fbf..7ccb9dc0 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardAutoCompleteSignInActivity.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardAutoCompleteSignInActivity.kt @@ -83,7 +83,7 @@ class StandardAutoCompleteSignInActivity : AppCompatActivity() { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Fake implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ fun isValidCredentials(username: String?, password: String?): Boolean { diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardSignInActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardSignInActivity.kt index 971bd167..1a815d2c 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardSignInActivity.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/StandardSignInActivity.kt @@ -59,7 +59,7 @@ class StandardSignInActivity : AppCompatActivity() { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Fake implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ fun isValidCredentials(username: String, password: String): Boolean { diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/VirtualSignInActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/VirtualSignInActivity.kt index 6d86da95..6b5f24f7 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/VirtualSignInActivity.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/VirtualSignInActivity.kt @@ -58,7 +58,7 @@ class VirtualSignInActivity : AppCompatActivity() { } /** - * Dummy implementation for demo purposes. A real service should use secure mechanisms to + * Fake implementation for demo purposes. A real service should use secure mechanisms to * authenticate users. */ fun isValidCredentials(username: String?, password: String?): Boolean { diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AuthActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AuthActivity.kt index e02a311a..1ab2ea5a 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AuthActivity.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AuthActivity.kt @@ -37,7 +37,7 @@ import com.example.android.autofillframework.multidatasetservice.datasource.Shar import com.example.android.autofillframework.multidatasetservice.settings.MyPreferences import kotlinx.android.synthetic.main.multidataset_service_auth_activity.cancel import kotlinx.android.synthetic.main.multidataset_service_auth_activity.login -import kotlinx.android.synthetic.main.multidataset_service_auth_activity.master_password +import kotlinx.android.synthetic.main.multidataset_service_auth_activity.main_password /** * This Activity controls the UI for logging in to the Autofill service. @@ -59,8 +59,8 @@ class AuthActivity : AppCompatActivity() { } private fun submitLogin() { - val password = master_password.text - if (password.toString() == MyPreferences.getMasterPassword(this@AuthActivity)) { + val password = main_password.text + if (password.toString() == MyPreferences.getMainPassword(this@AuthActivity)) { onSuccess() } else { Toast.makeText(this, "Password incorrect", Toast.LENGTH_SHORT).show() diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/MyPreferences.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/MyPreferences.kt index 1ddf3dab..d3a77131 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/MyPreferences.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/MyPreferences.kt @@ -26,7 +26,7 @@ object MyPreferences { private val SHARED_PREF_KEY = "com.example.android.autofillframework.service.settings.MyPreferences" private val RESPONSE_AUTH_KEY = "response_auth" private val DATASET_AUTH_KEY = "dataset_auth" - private val MASTER_PASSWORD_KEY = "master_password" + private val MAIN_PASSWORD_KEY = "main_password" private fun getPrefs(context: Context): SharedPreferences { return context.applicationContext.getSharedPreferences(SHARED_PREF_KEY, Context.MODE_PRIVATE) @@ -55,23 +55,23 @@ object MyPreferences { } /** - * Gets autofill master password. + * Gets autofill main password. */ - fun getMasterPassword(context: Context): String? { - return getPrefs(context).getString(MASTER_PASSWORD_KEY, null) + fun getMainPassword(context: Context): String? { + return getPrefs(context).getString(MAIN_PASSWORD_KEY, null) } /** - * Sets autofill master password. + * Sets autofill main password. */ - fun setMasterPassword(context: Context, masterPassword: String) { - getPrefs(context).edit().putString(MASTER_PASSWORD_KEY, masterPassword).apply() + fun setMainPassword(context: Context, mainPassword: String) { + getPrefs(context).edit().putString(MAIN_PASSWORD_KEY, mainPassword).apply() } /** - * Removes master password. + * Removes main password. */ fun clearCredentials(context: Context) { - getPrefs(context).edit().remove(MASTER_PASSWORD_KEY).apply() + getPrefs(context).edit().remove(MAIN_PASSWORD_KEY).apply() } } diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt index c24a0e95..5eeb901d 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt @@ -70,7 +70,7 @@ class SettingsActivity : AppCompatActivity() { settings_auth_credentials_label, settings_auth_credentials_icon, View.OnClickListener { - if (MyPreferences.getMasterPassword(this@SettingsActivity) != null) { + if (MyPreferences.getMainPassword(this@SettingsActivity) != null) { buildCurrentCredentialsDialog().show() } else { buildNewCredentialsDialog().show() @@ -101,13 +101,13 @@ class SettingsActivity : AppCompatActivity() { val currentPasswordField = LayoutInflater .from(this@SettingsActivity) .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) - .findViewById<EditText>(R.id.master_password_field) + .findViewById<EditText>(R.id.main_password_field) return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_current_password) .setView(currentPasswordField) .setPositiveButton(R.string.ok) { dialog, which -> val password = currentPasswordField.text.toString() - if (MyPreferences.getMasterPassword(this@SettingsActivity) == password) { + if (MyPreferences.getMainPassword(this@SettingsActivity) == password) { buildNewCredentialsDialog().show() dialog.dismiss() } @@ -119,13 +119,13 @@ class SettingsActivity : AppCompatActivity() { val newPasswordField = LayoutInflater .from(this@SettingsActivity) .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) - .findViewById<EditText>(R.id.master_password_field) + .findViewById<EditText>(R.id.main_password_field) return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_new_password) .setView(newPasswordField) .setPositiveButton(R.string.ok) { dialog, which -> val password = newPasswordField.text.toString() - MyPreferences.setMasterPassword(this@SettingsActivity, password) + MyPreferences.setMainPassword(this@SettingsActivity, password) dialog.dismiss() } .create() diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_auth_activity.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_auth_activity.xml index 981dd0d8..459d5bcd 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_auth_activity.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_auth_activity.xml @@ -28,12 +28,12 @@ tools:context=".multidatasetservice.AuthActivity"> <TextView - android:id="@+id/master_login_header" + android:id="@+id/main_login_header" style="@style/TextAppearance.AppCompat.Large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/spacing_normal" - android:text="@string/autofill_master_login_label" + android:text="@string/autofill_main_login_label" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -47,15 +47,15 @@ android:layout_marginEnd="@dimen/spacing_normal" android:layout_marginStart="@dimen/spacing_normal" android:layout_marginTop="@dimen/spacing_large" - android:labelFor="@+id/master_password" + android:labelFor="@+id/main_password" android:text="@string/password_label" - app:layout_constraintEnd_toStartOf="@+id/master_password" + app:layout_constraintEnd_toStartOf="@+id/main_password" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/master_login_header" /> + app:layout_constraintTop_toBottomOf="@+id/main_login_header" /> <EditText - android:id="@+id/master_password" + android:id="@+id/main_password" android:layout_width="@dimen/text_field_width" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/spacing_normal" @@ -80,7 +80,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/master_password" /> + app:layout_constraintTop_toBottomOf="@+id/main_password" /> <TextView android:id="@+id/login" diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml index 93ac6dd1..9e51fddc 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml @@ -15,7 +15,7 @@ * limitations under the License. --> <EditText xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/master_password_field" + android:id="@+id/main_password_field" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/spacing_normal" diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/values/strings.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/values/strings.xml index 46b5349b..3765f51e 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/values/strings.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/values/strings.xml @@ -56,7 +56,7 @@ <string name="login_label">Login</string> <string name="to_label">To</string> <string name="body_label">Body</string> - <string name="autofill_master_login_label">Autofill Master Login</string> + <string name="autofill_main_login_label">Autofill Main Login</string> <string name="submit_label">Submit</string> <string name="cc_exp_month_description">Credit Card Expiration Month</string> <string name="cc_exp_year_description">Credit Card Expiration Year</string> diff --git a/input/autofill/AutofillFramework/kotlinApp/README.md b/input/autofill/AutofillFramework/kotlinApp/README.md index d0ab0e01..4d11faa2 100644 --- a/input/autofill/AutofillFramework/kotlinApp/README.md +++ b/input/autofill/AutofillFramework/kotlinApp/README.md @@ -39,7 +39,7 @@ To set the device's default Autofill service to the one in the sample, edit **Se app. To edit the service's settings, tap the settings icon next to the **Auto-fill service** list item or open the **Autofill Settings** launcher icon.. Here, you can set whether you want to enable authentication on the entire autofill Response or just on individual autofill datasets. You should -also set the master password to “unlock” authenticated autofill data with. +also set the primary password to “unlock” authenticated autofill data with. **Note:** This sample service stores all autofill data in SharedPreferences and thus is not secure. Be careful about what you store when experimenting with the sample because anyone with root access diff --git a/input/autofill/AutofillFramework/template-params.xml b/input/autofill/AutofillFramework/template-params.xml index 37d6bd2a..b652b233 100644 --- a/input/autofill/AutofillFramework/template-params.xml +++ b/input/autofill/AutofillFramework/template-params.xml @@ -133,7 +133,7 @@ To set the device's default Autofill service to the one in the sample, edit **Se app. To edit the service's settings, tap the settings icon next to the **Auto-fill service** list item or open the **Autofill Settings** launcher icon.. Here, you can set whether you want to enable authentication on the entire autofill Response or just on individual autofill datasets. You should -also set the master password to “unlock” authenticated autofill data with. +also set the main password to “unlock” authenticated autofill data with. **Note:** This sample service stores all autofill data in SharedPreferences and thus is not secure. Be careful about what you store when experimenting with the sample because anyone with root access |