skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

A persistence model for the Java implementation and ability to parse in and write out export files.

Browse Source
This commit is contained in:
Maarten Billemont
2014-12-08 11:11:29 -05:00
parent 3f4558da2b
commit 4ff8cd6d90
15 changed files with 714 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,8 +86,7 @@ public class EmergencyActivity extends Activity {
sitePasswordField.setTypeface( Res.sourceCodePro_Black );
sitePasswordField.setPaintFlags( userNameField.getPaintFlags() | Paint.SUBPIXEL_TEXT_FLAG );
typeField.setAdapter(
new ArrayAdapter<MPSiteType>( this, R.layout.type_item, MPSiteType.forClass( MPSiteTypeClass.Generated ) ) );
typeField.setAdapter( new ArrayAdapter<>( this, R.layout.type_item, MPSiteType.forClass( MPSiteTypeClass.Generated ) ) );
typeField.setSelection( MPSiteType.GeneratedLong.ordinal() );
counterField.setMinValue( 1 );
@@ -129,7 +128,7 @@ public class EmergencyActivity extends Activity {
SharedPreferences.Editor pref = getPreferences( MODE_PRIVATE ).edit();
pref.putString( "userName", userName );
pref.commit();
pref.apply();
if (masterKeyFuture != null)
masterKeyFuture.cancel( true );
@@ -184,7 +183,7 @@ public class EmergencyActivity extends Activity {
@Override
public void run() {
try {
final String sitePassword = masterKeyFuture.get().encode( siteName, type, counter, variant, context );
final String sitePassword = masterKeyFuture.get().encode( siteName, type, counter, MPSiteVariant.Password, null );
runOnUiThread( new Runnable() {
@Override