skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Replace Version API with MPAlgorithm, make configuration instance-specific.

Browse Source
This commit is contained in:
Maarten Billemont
2018-04-26 15:56:12 -04:00
parent 33f2e0edda
commit 82e2d0b5ac
29 changed files with 397 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,7 +303,7 @@ public class EmergencyActivity extends Activity {
@Override
public void run() {
try {
sitePassword = masterKey.siteResult( siteName, counter, MPKeyPurpose.Authentication, null, type, null, version );
sitePassword = masterKey.siteResult( siteName, counter, MPKeyPurpose.Authentication, null, type, null, version.getAlgorithm() );
runOnUiThread( new Runnable() {
@Override

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

@@ -148,7 +148,7 @@ public final class Preferences {
@Nonnull
public MPResultType getDefaultResultType() {
return MPResultType.values()[prefs().getInt( PREF_RESULT_TYPE, MPAlgorithm.mpw_default_type.ordinal() )];
return MPResultType.values()[prefs().getInt( PREF_RESULT_TYPE, getDefaultVersion().getAlgorithm().mpw_default_type().ordinal() )];
}
public boolean setDefaultVersion(final MPMasterKey.Version value) {

2
platform-android/src/main/java/com/lyndir/masterpassword/TestActivity.java
View File

@@ -38,6 +38,7 @@ import java.util.concurrent.Executors;
import javax.annotation.Nullable;
@SuppressWarnings("PublicMethodNotExposedInInterface" /* IDEA-191044 */)
public class TestActivity extends Activity implements MPTestSuite.Listener {
@SuppressWarnings("UnusedDeclaration")
@@ -64,6 +65,7 @@ public class TestActivity extends Activity implements MPTestSuite.Listener {
private MPTestSuite testSuite;
private ListenableFuture<Boolean> testFuture;
@Nullable
private Runnable action;
private ImmutableSet<String> testNames;