skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix a bug with storing the default algorithm version.

Browse Source
This commit is contained in:
Maarten Billemont 2016-02-20 22:26:50 -05:00
parent 64829c99d8
commit 7eb10cb5a6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,7 @@ public class EmergencyActivity extends Activity {
try { try {
return MasterKey.create( version, fullName, masterPassword ); return MasterKey.create( version, fullName, masterPassword );
} }
catch (RuntimeException e) { catch (Exception e) {
sitePasswordField.setText( "" ); sitePasswordField.setText( "" );
progressView.setVisibility( View.INVISIBLE ); progressView.setVisibility( View.INVISIBLE );
logger.err( e, "While generating master key." ); logger.err( e, "While generating master key." );

5
MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/masterpassword/Preferences.java
View File

@ -21,6 +21,7 @@ public class Preferences {
private static final String PREF_MASK_PASSWORD = "maskPassword"; private static final String PREF_MASK_PASSWORD = "maskPassword";
private static final String PREF_FULL_NAME = "fullName"; private static final String PREF_FULL_NAME = "fullName";
private static final String PREF_SITE_TYPE = "siteType"; private static final String PREF_SITE_TYPE = "siteType";
private static final String PREF_ALGORITHM_VERSION = "algorithmVersion";
private static Preferences instance; private static Preferences instance;
private Context context; private Context context;
@ -136,12 +137,12 @@ public class Preferences {
if (getDefaultVersion().equals( value )) if (getDefaultVersion().equals( value ))
return false; return false;
prefs().edit().putInt( PREF_SITE_TYPE, value.ordinal() ).apply(); prefs().edit().putInt( PREF_ALGORITHM_VERSION, value.ordinal() ).apply();
return true; return true;
} }
@Nonnull @Nonnull
public MasterKey.Version getDefaultVersion() { public MasterKey.Version getDefaultVersion() {
return MasterKey.Version.values()[prefs().getInt( PREF_SITE_TYPE, MasterKey.Version.CURRENT.ordinal() )]; return MasterKey.Version.values()[prefs().getInt( PREF_ALGORITHM_VERSION, MasterKey.Version.CURRENT.ordinal() )];
} }
} }