skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Refactoring masterpassword-algorithm.

Browse Source
This commit is contained in:
Maarten Billemont
2018-05-16 00:12:31 -04:00
parent 8bdf1755b7
commit 0aa7baf59e
24 changed files with 468 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform-android/src/main/java/com/lyndir/masterpassword/EmergencyActivity.java
View File

@@ -58,7 +58,7 @@ public class EmergencyActivity extends Activity {
Executors.newSingleThreadExecutor() );
private final ImmutableList<MPResultType> allResultTypes = ImmutableList.copyOf(
MPResultType.forClass( MPResultTypeClass.Template ) );
private final ImmutableList<MPMasterKey.Version> allVersions = ImmutableList.copyOf( MPMasterKey.Version.values() );
private final ImmutableList<MPAlgorithm.Version> allVersions = ImmutableList.copyOf( MPAlgorithm.Version.values() );
@Nullable
private MPMasterKey masterKey;
@@ -160,7 +160,7 @@ public class EmergencyActivity extends Activity {
@Override
public void onClick(final View v) {
@SuppressWarnings("SuspiciousMethodCalls")
MPMasterKey.Version siteVersion =
MPAlgorithm.Version siteVersion =
allVersions.get( (allVersions.indexOf( siteVersionButton.getTag() ) + 1) % allVersions.size() );
preferences.setDefaultVersion( siteVersion );
siteVersionButton.setTag( siteVersion );
@@ -227,7 +227,7 @@ public class EmergencyActivity extends Activity {
MPResultType defaultResultType = preferences.getDefaultResultType();
resultTypeButton.setTag( defaultResultType );
resultTypeButton.setText( defaultResultType.getShortName() );
MPMasterKey.Version defaultVersion = preferences.getDefaultVersion();
MPAlgorithm.Version defaultVersion = preferences.getDefaultVersion();
siteVersionButton.setTag( defaultVersion );
siteVersionButton.setText( defaultVersion.name() );
siteCounterButton.setText( MessageFormat.format( "{0}", 1 ) );
@@ -289,7 +289,7 @@ public class EmergencyActivity extends Activity {
final String siteName = siteNameField.getText().toString();
final MPResultType type = (MPResultType) resultTypeButton.getTag();
final UnsignedInteger counter = UnsignedInteger.valueOf( siteCounterButton.getText().toString() );
final MPMasterKey.Version version = (MPMasterKey.Version) siteVersionButton.getTag();
final MPAlgorithm.Version version = (MPAlgorithm.Version) siteVersionButton.getTag();
if ((masterKey == null) || siteName.isEmpty() || (type == null)) {
sitePasswordField.setText( "" );
@@ -306,8 +306,8 @@ public class EmergencyActivity extends Activity {
@Override
public void run() {
try {
sitePassword = masterKey.siteResult( siteName, counter, MPKeyPurpose.Authentication, null, type, null,
version.getAlgorithm() );
sitePassword = masterKey.siteResult( siteName, version.getAlgorithm(), counter, MPKeyPurpose.Authentication, null, type, null
);
runOnUiThread( new Runnable() {
@Override

6
platform-android/src/main/java/com/lyndir/masterpassword/Preferences.java
View File

@@ -151,7 +151,7 @@ public final class Preferences {
return MPResultType.values()[prefs().getInt( PREF_RESULT_TYPE, getDefaultVersion().getAlgorithm().mpw_default_result_type().ordinal() )];
}
public boolean setDefaultVersion(final MPMasterKey.Version value) {
public boolean setDefaultVersion(final MPAlgorithm.Version value) {
if (getDefaultVersion() == value)
return false;
@@ -160,7 +160,7 @@ public final class Preferences {
}
@Nonnull
public MPMasterKey.Version getDefaultVersion() {
return MPMasterKey.Version.values()[prefs().getInt( PREF_ALGORITHM_VERSION, MPMasterKey.Version.CURRENT.ordinal() )];
public MPAlgorithm.Version getDefaultVersion() {
return MPAlgorithm.Version.values()[prefs().getInt( PREF_ALGORITHM_VERSION, MPAlgorithm.Version.CURRENT.ordinal() )];
}
}