kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #641 from jsoberg/#638-PasswordConfirmationMethod

Browse source 
#638 - Convert all password views with confirmation field to share toggle state
This commit is contained in:
Jakob Nixdorf 2020-09-25 05:58:23 +02:00 committed by GitHub
commit 0ea8ef6a27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/org/shadowice/flocke/andotp/Activities/IntroScreenActivity.java
View file

@ -54,6 +54,7 @@ import com.heinrichreimersoftware.materialintro.slide.FragmentSlide;
import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
import org.shadowice.flocke.andotp.R;
import org.shadowice.flocke.andotp.Utilities.ConfirmedPasswordTransformationHelper;
import org.shadowice.flocke.andotp.Utilities.Constants;
import org.shadowice.flocke.andotp.Utilities.Settings;
import org.shadowice.flocke.andotp.Utilities.UIHelper;
@ -380,7 +381,7 @@ public class IntroScreenActivity extends IntroActivity {
passwordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
passwordConfirm.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
setPasswordTransformationMethod();
ConfirmedPasswordTransformationHelper.setup(passwordLayout, passwordInput, passwordConfirm);
minLength = Constants.AUTH_MIN_PASSWORD_LENGTH;
lengthWarning = getString(R.string.settings_label_short_password, minLength);
@ -390,33 +391,6 @@ public class IntroScreenActivity extends IntroActivity {
focusOnPasswordInput();
}
private void setPasswordTransformationMethod() {
passwordLayout.setEndIconOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
boolean wasShowingPassword = passwordInput.getTransformationMethod() instanceof PasswordTransformationMethod;
// Dispatch password visibility change to both password and confirm inputs
dispatchPasswordVisibilityChange(passwordInput, wasShowingPassword);
dispatchPasswordVisibilityChange(passwordConfirm, wasShowingPassword);
passwordLayout.refreshDrawableState();
}
});
passwordInput.setTransformationMethod(PasswordTransformationMethod.getInstance());
passwordConfirm.setTransformationMethod(PasswordTransformationMethod.getInstance());
}
private void dispatchPasswordVisibilityChange(EditText editText, boolean wasShowingPassword) {
final int selection = editText.getSelectionEnd();
if (wasShowingPassword) {
editText.setTransformationMethod(null);
} else {
editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
}
if (selection >= 0) {
editText.setSelection(selection);
}
}
private void focusOnPasswordInput() {
if (getIntroActivity().getCurrentSlidePosition() == slidePos) {
passwordInput.requestFocus();
@ -433,7 +407,7 @@ public class IntroScreenActivity extends IntroActivity {
passwordInput.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
passwordConfirm.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
setPasswordTransformationMethod();
ConfirmedPasswordTransformationHelper.setup(passwordLayout, passwordInput, passwordConfirm);
minLength = Constants.AUTH_MIN_PIN_LENGTH;
lengthWarning = getString(R.string.settings_label_short_pin, minLength);

2
app/src/main/java/org/shadowice/flocke/andotp/Dialogs/PasswordEntryDialog.java
View file

@ -15,6 +15,7 @@ import android.widget.Button;
import android.widget.EditText;
import org.shadowice.flocke.andotp.R;
import org.shadowice.flocke.andotp.Utilities.ConfirmedPasswordTransformationHelper;
import org.shadowice.flocke.andotp.Utilities.Tools;
public class PasswordEntryDialog extends AppCompatDialog
@ -42,6 +43,7 @@ public class PasswordEntryDialog extends AppCompatDialog
TextInputLayout passwordLayout = findViewById(R.id.passwordInputLayout);
passwordInput = findViewById(R.id.passwordInput);
passwordConfirm = findViewById(R.id.passwordConfirm);
ConfirmedPasswordTransformationHelper.setup(passwordLayout, passwordInput, passwordConfirm);
if (blockAccessibility) {
passwordLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);

7
app/src/main/java/org/shadowice/flocke/andotp/Preferences/CredentialsPreference.java
View file

@ -46,6 +46,7 @@ import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import org.shadowice.flocke.andotp.R;
import org.shadowice.flocke.andotp.Utilities.ConfirmedPasswordTransformationHelper;
import org.shadowice.flocke.andotp.Utilities.Constants;
import org.shadowice.flocke.andotp.Utilities.Settings;
import org.shadowice.flocke.andotp.Utilities.UIHelper;
@ -256,8 +257,7 @@ public class CredentialsPreference extends DialogPreference
passwordLayout.setHint(getContext().getString(R.string.settings_hint_password));
passwordConfirm.setHint(R.string.settings_hint_password_confirm);
passwordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
passwordConfirm.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
ConfirmedPasswordTransformationHelper.setup(passwordLayout, passwordInput, passwordConfirm);
passwordInput.setTransformationMethod(new PasswordTransformationMethod());
passwordConfirm.setTransformationMethod(new PasswordTransformationMethod());
@ -278,8 +278,7 @@ public class CredentialsPreference extends DialogPreference
passwordInput.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
passwordConfirm.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
passwordInput.setTransformationMethod(new PasswordTransformationMethod());
passwordConfirm.setTransformationMethod(new PasswordTransformationMethod());
ConfirmedPasswordTransformationHelper.setup(passwordLayout, passwordInput, passwordConfirm);
minLength = Constants.AUTH_MIN_PIN_LENGTH;
toShortWarning.setText(getContext().getString(R.string.settings_label_short_pin, minLength));

4
app/src/main/java/org/shadowice/flocke/andotp/Preferences/PasswordEncryptedPreference.java
View file

@ -40,6 +40,7 @@ import android.widget.Button;
import android.widget.EditText;
import org.shadowice.flocke.andotp.R;
import org.shadowice.flocke.andotp.Utilities.ConfirmedPasswordTransformationHelper;
import org.shadowice.flocke.andotp.Utilities.Constants;
import org.shadowice.flocke.andotp.Utilities.EncryptionHelper;
import org.shadowice.flocke.andotp.Utilities.KeyStoreHelper;
@ -135,8 +136,7 @@ public class PasswordEncryptedPreference extends DialogPreference
passwordConfirm.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
}
passwordInput.setTransformationMethod(new PasswordTransformationMethod());
passwordConfirm.setTransformationMethod(new PasswordTransformationMethod());
ConfirmedPasswordTransformationHelper.setup(passwordLayout, passwordInput, passwordConfirm);
passwordConfirm.addTextChangedListener(this);
passwordInput.addTextChangedListener(this);

32
app/src/main/java/org/shadowice/flocke/andotp/Utilities/ConfirmedPasswordTransformationHelper.java Normal file
View file

@ -0,0 +1,32 @@
package org.shadowice.flocke.andotp.Utilities;
import android.text.method.PasswordTransformationMethod;
import android.widget.EditText;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
public final class ConfirmedPasswordTransformationHelper {
/** Sets up the specified password views for a toggleable obscure/view password text transformation. */
public static void setup(TextInputLayout passwordLayout, TextInputEditText passwordInput, EditText passwordConfirmInput) {
passwordLayout.setEndIconOnClickListener(v -> {
boolean wasShowingPassword = passwordInput.getTransformationMethod() instanceof PasswordTransformationMethod;
// Dispatch password visibility change to both password and confirm inputs
dispatchPasswordVisibilityChange(passwordInput, wasShowingPassword);
dispatchPasswordVisibilityChange(passwordConfirmInput, wasShowingPassword);
passwordLayout.refreshDrawableState();
});
passwordInput.setTransformationMethod(PasswordTransformationMethod.getInstance());
passwordConfirmInput.setTransformationMethod(PasswordTransformationMethod.getInstance());
}
private static void dispatchPasswordVisibilityChange(EditText editText, boolean wasShowingPassword) {
final int selection = editText.getSelectionEnd();
PasswordTransformationMethod newMethod = wasShowingPassword ? null : PasswordTransformationMethod.getInstance();
editText.setTransformationMethod(newMethod);
if (selection >= 0) {
editText.setSelection(selection);
}
}
}

2
app/src/main/res/layout/component_authentication.xml
View file

@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/settings_hint_password"
app:passwordToggleEnabled="true" >
app:endIconMode="password_toggle" >
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/passwordEdit"

2
app/src/main/res/layout/component_password.xml
View file

@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/settings_hint_password"
app:passwordToggleEnabled="true" >
app:endIconMode="password_toggle" >
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/passwordEdit"

2
app/src/main/res/layout/content_authenticate.xml
View file

@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/auth_hint_password"
app:passwordToggleEnabled="true" >
app:endIconMode="password_toggle" >
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/passwordEdit"

2
app/src/main/res/layout/dialog_password_entry.xml
View file

@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/dialog_label_enter_password"
app:passwordToggleEnabled="true" >
app:endIconMode="password_toggle" >
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/passwordInput"