From 683c0165e6c432b40ffdfb800e5dd25dafa84cba Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 19 Jun 2018 01:54:20 -0400 Subject: [PATCH] Reset Android counter on long-touch. --- .../lyndir/masterpassword/EmergencyActivity.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java b/platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java index a66a19c7..95386054 100644 --- a/platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java +++ b/platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java @@ -130,7 +130,7 @@ public class EmergencyActivity extends Activity { siteNameField.addTextChangedListener( new ValueChangedListener() { @Override void update() { - siteCounterButton.setText( MessageFormat.format( "{0}", 1 ) ); + siteCounterButton.setText( MessageFormat.format( "{0}", UnsignedInteger.ONE ) ); updateSitePassword(); } } ); @@ -155,6 +155,17 @@ public class EmergencyActivity extends Activity { updateSitePassword(); } } ); + siteCounterButton.setOnLongClickListener( new View.OnLongClickListener() { + @Override + public boolean onLongClick(final View v) { + if (UnsignedInteger.valueOf( siteCounterButton.getText().toString() ).equals( UnsignedInteger.ONE )) + return false; + + siteCounterButton.setText( MessageFormat.format( "{0}", UnsignedInteger.ONE ) ); + updateSitePassword(); + return true; + } + } ); siteVersionButton.setOnClickListener( new View.OnClickListener() { @Override public void onClick(final View v) { @@ -229,7 +240,7 @@ public class EmergencyActivity extends Activity { MPAlgorithm.Version defaultVersion = preferences.getDefaultVersion(); siteVersionButton.setTag( defaultVersion ); siteVersionButton.setText( defaultVersion.name() ); - siteCounterButton.setText( MessageFormat.format( "{0}", 1 ) ); + siteCounterButton.setText( MessageFormat.format( "{0}", UnsignedInteger.ONE ) ); if (TextUtils.isEmpty( fullNameField.getText() )) fullNameField.requestFocus();