Refactor code.
This commit is contained in:
parent
0aa7baf59e
commit
1b703515dd
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
package com.lyndir.masterpassword.model;
|
package com.lyndir.masterpassword.model;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author lhunath, 14-12-17
|
* @author lhunath, 14-12-17
|
||||||
*/
|
*/
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
package com.lyndir.masterpassword.model;
|
package com.lyndir.masterpassword.model;
|
||||||
|
|
||||||
import com.google.common.collect.*;
|
import com.google.common.collect.*;
|
||||||
import com.lyndir.masterpassword.model.impl.MPFileUser;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.SortedSet;
|
import java.util.SortedSet;
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
package com.lyndir.masterpassword.model.impl;
|
package com.lyndir.masterpassword.model.impl;
|
||||||
|
|
||||||
import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
|
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
|
||||||
|
|
||||||
import com.lyndir.masterpassword.*;
|
import com.lyndir.masterpassword.*;
|
||||||
import com.lyndir.masterpassword.model.MPQuestion;
|
import com.lyndir.masterpassword.model.MPQuestion;
|
||||||
@ -70,7 +70,6 @@ public abstract class MPBasicQuestion implements MPQuestion {
|
|||||||
@Override
|
@Override
|
||||||
public abstract MPBasicSite getSite();
|
public abstract MPBasicSite getSite();
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hashCode( getKeyword() );
|
return Objects.hashCode( getKeyword() );
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
package com.lyndir.masterpassword.model.impl;
|
package com.lyndir.masterpassword.model.impl;
|
||||||
|
|
||||||
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse;
|
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
|
||||||
|
|
||||||
import com.lyndir.masterpassword.*;
|
import com.lyndir.masterpassword.*;
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
@ -33,7 +33,7 @@ public class MPFileQuestion extends MPBasicQuestion {
|
|||||||
private final MPFileSite site;
|
private final MPFileSite site;
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
private String state;
|
private String state;
|
||||||
|
|
||||||
public MPFileQuestion(final MPFileSite site, final String keyword,
|
public MPFileQuestion(final MPFileSite site, final String keyword,
|
||||||
@Nullable final MPResultType type, @Nullable final String state) {
|
@Nullable final MPResultType type, @Nullable final String state) {
|
||||||
|
@ -24,7 +24,8 @@ import com.google.common.base.Charsets;
|
|||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.io.CharSink;
|
import com.google.common.io.CharSink;
|
||||||
import com.lyndir.lhunath.opal.system.logging.Logger;
|
import com.lyndir.lhunath.opal.system.logging.Logger;
|
||||||
import com.lyndir.masterpassword.*;
|
import com.lyndir.masterpassword.MPKeyUnavailableException;
|
||||||
|
import com.lyndir.masterpassword.MPMasterKey;
|
||||||
import com.lyndir.masterpassword.model.*;
|
import com.lyndir.masterpassword.model.*;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -21,7 +21,7 @@ package com.lyndir.masterpassword.model.impl;
|
|||||||
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
|
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
|
||||||
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
|
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
|
||||||
|
|
||||||
import com.lyndir.masterpassword.*;
|
import com.lyndir.masterpassword.MPKeyUnavailableException;
|
||||||
import com.lyndir.masterpassword.model.MPConstant;
|
import com.lyndir.masterpassword.model.MPConstant;
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
import org.joda.time.Instant;
|
import org.joda.time.Instant;
|
||||||
|
@ -78,7 +78,7 @@ public class MPFlatUnmarshaller implements MPUnmarshaller {
|
|||||||
// Ends the header.
|
// Ends the header.
|
||||||
user = new MPFileUser( fullName, keyID, MPAlgorithm.Version.fromInt( mpVersion ).getAlgorithm(),
|
user = new MPFileUser( fullName, keyID, MPAlgorithm.Version.fromInt( mpVersion ).getAlgorithm(),
|
||||||
avatar, defaultType, new DateTime( 0 ), MPMarshalFormat.Flat,
|
avatar, defaultType, new DateTime( 0 ), MPMarshalFormat.Flat,
|
||||||
clearContent? MPMarshaller.ContentMode.VISIBLE : MPMarshaller.ContentMode.PROTECTED );
|
clearContent? MPMarshaller.ContentMode.VISIBLE: MPMarshaller.ContentMode.PROTECTED );
|
||||||
|
|
||||||
// Comment.
|
// Comment.
|
||||||
else if (line.startsWith( "#" )) {
|
else if (line.startsWith( "#" )) {
|
||||||
@ -118,7 +118,7 @@ public class MPFlatUnmarshaller implements MPUnmarshaller {
|
|||||||
case 0:
|
case 0:
|
||||||
site = new MPFileSite( user, //
|
site = new MPFileSite( user, //
|
||||||
siteMatcher.group( 5 ), MPAlgorithm.Version.fromInt( ConversionUtils.toIntegerNN(
|
siteMatcher.group( 5 ), MPAlgorithm.Version.fromInt( ConversionUtils.toIntegerNN(
|
||||||
colon.matcher( siteMatcher.group( 4 ) ).replaceAll( "" ) ) ).getAlgorithm(),
|
colon.matcher( siteMatcher.group( 4 ) ).replaceAll( "" ) ) ).getAlgorithm(),
|
||||||
user.getAlgorithm().mpw_default_counter(),
|
user.getAlgorithm().mpw_default_counter(),
|
||||||
MPResultType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ),
|
MPResultType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ),
|
||||||
clearContent? null: siteMatcher.group( 6 ),
|
clearContent? null: siteMatcher.group( 6 ),
|
||||||
@ -131,7 +131,7 @@ public class MPFlatUnmarshaller implements MPUnmarshaller {
|
|||||||
case 1:
|
case 1:
|
||||||
site = new MPFileSite( user, //
|
site = new MPFileSite( user, //
|
||||||
siteMatcher.group( 7 ), MPAlgorithm.Version.fromInt( ConversionUtils.toIntegerNN(
|
siteMatcher.group( 7 ), MPAlgorithm.Version.fromInt( ConversionUtils.toIntegerNN(
|
||||||
colon.matcher( siteMatcher.group( 4 ) ).replaceAll( "" ) ) ).getAlgorithm(),
|
colon.matcher( siteMatcher.group( 4 ) ).replaceAll( "" ) ) ).getAlgorithm(),
|
||||||
UnsignedInteger.valueOf( colon.matcher( siteMatcher.group( 5 ) ).replaceAll( "" ) ),
|
UnsignedInteger.valueOf( colon.matcher( siteMatcher.group( 5 ) ).replaceAll( "" ) ),
|
||||||
MPResultType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ),
|
MPResultType.forType( ConversionUtils.toIntegerNN( siteMatcher.group( 3 ) ) ),
|
||||||
clearContent? null: siteMatcher.group( 8 ),
|
clearContent? null: siteMatcher.group( 8 ),
|
||||||
|
@ -21,13 +21,14 @@ package com.lyndir.masterpassword.model.impl;
|
|||||||
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
|
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.*;
|
import com.fasterxml.jackson.annotation.*;
|
||||||
import com.fasterxml.jackson.databind.*;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.google.common.primitives.UnsignedInteger;
|
import com.google.common.primitives.UnsignedInteger;
|
||||||
import com.lyndir.lhunath.opal.system.CodeUtils;
|
import com.lyndir.lhunath.opal.system.CodeUtils;
|
||||||
import com.lyndir.masterpassword.*;
|
import com.lyndir.masterpassword.*;
|
||||||
import com.lyndir.masterpassword.model.MPConstant;
|
import com.lyndir.masterpassword.model.MPConstant;
|
||||||
import com.lyndir.masterpassword.model.MPIncorrectMasterPasswordException;
|
import com.lyndir.masterpassword.model.MPIncorrectMasterPasswordException;
|
||||||
import java.util.*;
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.Map;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
import org.joda.time.Instant;
|
import org.joda.time.Instant;
|
||||||
|
|
||||||
@ -220,6 +221,7 @@ public class MPJSONFile extends MPJSONAnyObject {
|
|||||||
@Nullable
|
@Nullable
|
||||||
Ext _ext_mpw;
|
Ext _ext_mpw;
|
||||||
|
|
||||||
|
|
||||||
public static class Ext extends MPJSONAnyObject {
|
public static class Ext extends MPJSONAnyObject {
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
package com.lyndir.masterpassword.model.impl;
|
package com.lyndir.masterpassword.model.impl;
|
||||||
|
|
||||||
import static com.lyndir.masterpassword.model.impl.MPJSONFile.objectMapper;
|
import static com.lyndir.masterpassword.model.impl.MPJSONFile.*;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.lyndir.masterpassword.MPKeyUnavailableException;
|
import com.lyndir.masterpassword.MPKeyUnavailableException;
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
package com.lyndir.masterpassword.model.impl;
|
package com.lyndir.masterpassword.model.impl;
|
||||||
|
|
||||||
import static com.lyndir.masterpassword.model.impl.MPJSONFile.objectMapper;
|
import static com.lyndir.masterpassword.model.impl.MPJSONFile.*;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonParseException;
|
import com.fasterxml.jackson.core.JsonParseException;
|
||||||
import com.fasterxml.jackson.databind.JsonMappingException;
|
import com.fasterxml.jackson.databind.JsonMappingException;
|
||||||
|
@ -1,67 +1,67 @@
|
|||||||
{
|
{
|
||||||
"export": {
|
"export": {
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"redacted": true,
|
"redacted": true,
|
||||||
"date": "2018-05-10T03:41:18Z",
|
"date": "2018-05-10T03:41:18Z",
|
||||||
"_ext_mpw": {
|
"_ext_mpw": {
|
||||||
"save": "me"
|
"save": "me"
|
||||||
},
|
},
|
||||||
"_ext_other": {
|
"_ext_other": {
|
||||||
"save": "me"
|
"save": "me"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"user": {
|
"user": {
|
||||||
"avatar": 3,
|
"avatar": 3,
|
||||||
"full_name": "Robert Lee Mitchell",
|
"full_name": "Robert Lee Mitchell",
|
||||||
"last_used": "2018-05-10T03:41:18Z",
|
"last_used": "2018-05-10T03:41:18Z",
|
||||||
"key_id": "98EEF4D1DF46D849574A82A03C3177056B15DFFCA29BB3899DE4628453675302",
|
"key_id": "98EEF4D1DF46D849574A82A03C3177056B15DFFCA29BB3899DE4628453675302",
|
||||||
"algorithm": 3,
|
"algorithm": 3,
|
||||||
"default_type": 17,
|
"default_type": 17,
|
||||||
"_ext_mpw": {
|
"_ext_mpw": {
|
||||||
"save": "me"
|
"save": "me"
|
||||||
},
|
},
|
||||||
"_ext_other": {
|
"_ext_other": {
|
||||||
"save": "me"
|
"save": "me"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sites": {
|
"sites": {
|
||||||
"masterpasswordapp.com": {
|
"masterpasswordapp.com": {
|
||||||
"type": 17,
|
"type": 17,
|
||||||
"counter": 1,
|
"counter": 1,
|
||||||
"algorithm": 3,
|
"algorithm": 3,
|
||||||
"login_type": 30,
|
"login_type": 30,
|
||||||
"uses": 2,
|
"uses": 2,
|
||||||
"last_used": "2018-05-10T03:41:18Z",
|
"last_used": "2018-05-10T03:41:18Z",
|
||||||
"questions": {
|
"questions": {
|
||||||
"": {
|
"": {
|
||||||
"type": 31
|
"type": 31
|
||||||
},
|
},
|
||||||
"mother": {
|
"mother": {
|
||||||
"type": 31
|
"type": 31
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"_ext_mpw": {
|
"_ext_mpw": {
|
||||||
"url": "https://masterpasswordapp.com",
|
"url": "https://masterpasswordapp.com",
|
||||||
"save": "me"
|
"save": "me"
|
||||||
},
|
},
|
||||||
"_ext_other": {
|
"_ext_other": {
|
||||||
"save": "me"
|
"save": "me"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"personal.site": {
|
"personal.site": {
|
||||||
"type": 1056,
|
"type": 1056,
|
||||||
"counter": 1,
|
"counter": 1,
|
||||||
"algorithm": 3,
|
"algorithm": 3,
|
||||||
"password": "ZTgr4cY6L28wG7DsO+iz\/hrTQxM3UHz0x8ZU99LjgxjHG+bLIJygkbg\/7HdjEIFH6A3z+Dt2H1gpt9yPyQGZcewTiPXJX0pNpVsIKAAdzVNcUfYoqkWjoFRoZD7sM\/ctxWDH4JUuJ+rjoBkWtRLK9kYBvu7UD1QdlEZI\/wPKv1A=",
|
"password": "ZTgr4cY6L28wG7DsO+iz\/hrTQxM3UHz0x8ZU99LjgxjHG+bLIJygkbg\/7HdjEIFH6A3z+Dt2H1gpt9yPyQGZcewTiPXJX0pNpVsIKAAdzVNcUfYoqkWjoFRoZD7sM\/ctxWDH4JUuJ+rjoBkWtRLK9kYBvu7UD1QdlEZI\/wPKv1A=",
|
||||||
"login_type": 30,
|
"login_type": 30,
|
||||||
"uses": 1,
|
"uses": 1,
|
||||||
"last_used": "2018-05-10T03:48:35Z"
|
"last_used": "2018-05-10T03:48:35Z"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"_ext_mpw": {
|
"_ext_mpw": {
|
||||||
"save": "me"
|
"save": "me"
|
||||||
},
|
},
|
||||||
"_ext_other": {
|
"_ext_other": {
|
||||||
"save": "me"
|
"save": "me"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -306,8 +306,8 @@ public class EmergencyActivity extends Activity {
|
|||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
sitePassword = masterKey.siteResult( siteName, version.getAlgorithm(), counter, MPKeyPurpose.Authentication, null, type, null
|
sitePassword = masterKey.siteResult( siteName, version.getAlgorithm(), counter,
|
||||||
);
|
MPKeyPurpose.Authentication, null, type, null );
|
||||||
|
|
||||||
runOnUiThread( new Runnable() {
|
runOnUiThread( new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -148,7 +148,8 @@ public final class Preferences {
|
|||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
public MPResultType getDefaultResultType() {
|
public MPResultType getDefaultResultType() {
|
||||||
return MPResultType.values()[prefs().getInt( PREF_RESULT_TYPE, getDefaultVersion().getAlgorithm().mpw_default_result_type().ordinal() )];
|
return MPResultType.values()[
|
||||||
|
prefs().getInt( PREF_RESULT_TYPE, getDefaultVersion().getAlgorithm().mpw_default_result_type().ordinal() )];
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean setDefaultVersion(final MPAlgorithm.Version value) {
|
public boolean setDefaultVersion(final MPAlgorithm.Version value) {
|
||||||
@ -161,6 +162,7 @@ public final class Preferences {
|
|||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
public MPAlgorithm.Version getDefaultVersion() {
|
public MPAlgorithm.Version getDefaultVersion() {
|
||||||
return MPAlgorithm.Version.values()[prefs().getInt( PREF_ALGORITHM_VERSION, MPAlgorithm.Version.CURRENT.ordinal() )];
|
return MPAlgorithm.Version.values()[
|
||||||
|
prefs().getInt( PREF_ALGORITHM_VERSION, MPAlgorithm.Version.CURRENT.ordinal() )];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@ import javax.annotation.Nullable;
|
|||||||
public class MPIncognitoUser extends MPBasicUser<MPIncognitoSite> {
|
public class MPIncognitoUser extends MPBasicUser<MPIncognitoSite> {
|
||||||
|
|
||||||
public MPIncognitoUser(final String fullName) {
|
public MPIncognitoUser(final String fullName) {
|
||||||
super( fullName, MPAlgorithm.Version.CURRENT.getAlgorithm());
|
super( fullName, MPAlgorithm.Version.CURRENT.getAlgorithm() );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
@ -28,9 +28,8 @@ import com.lyndir.masterpassword.MPAlgorithm;
|
|||||||
import com.lyndir.masterpassword.MPResultType;
|
import com.lyndir.masterpassword.MPResultType;
|
||||||
import com.lyndir.masterpassword.gui.Res;
|
import com.lyndir.masterpassword.gui.Res;
|
||||||
import com.lyndir.masterpassword.gui.util.Components;
|
import com.lyndir.masterpassword.gui.util.Components;
|
||||||
import com.lyndir.masterpassword.model.*;
|
import com.lyndir.masterpassword.model.MPUser;
|
||||||
import com.lyndir.masterpassword.model.impl.*;
|
import com.lyndir.masterpassword.model.impl.*;
|
||||||
import com.lyndir.masterpassword.model.impl.MPFileSite;
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.*;
|
import java.awt.event.*;
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
|
Loading…
Reference in New Issue
Block a user