skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Update check for Java GUI + Copy password on Android + Native scrypt for Android.

Browse Source
This commit is contained in:
Maarten Billemont
2014-08-27 23:05:24 -04:00
parent f47ff67ba9
commit 76280ac71c
5 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MasterPassword/Java/masterpassword-android/pom.xml
View File

@@ -25,7 +25,9 @@
<artifactId>android-maven-plugin</artifactId>
<configuration>
<sdk>19</sdk>
<sdk>
<platform>19</platform>
</sdk>
</configuration>
</plugin>
</plugins>
@@ -59,6 +61,15 @@
<artifactId>android</artifactId>
</dependency>
<dependency>
<groupId>com.lambdaworks</groupId>
<artifactId>libscrypt</artifactId>
<version>1.4.0</version>
<type>so</type>
<classifier>android</classifier>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

6
MasterPassword/Java/masterpassword-android/res/layout/activity_emergency.xml
View File

@@ -64,14 +64,16 @@
android:textColor="#FFFFFF"
android:textSize="26sp" />
<TextView
<Button
android:id="@+id/sitePasswordField"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:background="@null"
android:textColor="#FFFFFF"
android:textSize="32sp"
android:text="LuxdZozvDuma4[" />
android:text="LuxdZozvDuma4["
android:onClick="copySitePassword" />
<Spinner
android:id="@+id/typeField"

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

@@ -1,7 +1,9 @@
package com.lyndir.masterpassword;
import static com.lyndir.lhunath.opal.system.util.StringUtils.strf;
import android.app.Activity;
import android.content.SharedPreferences;
import android.content.*;
import android.graphics.Paint;
import android.os.Bundle;
import android.text.Editable;
@@ -85,7 +87,8 @@ public class EmergencyActivity extends Activity {
sitePasswordField.setTypeface( Res.sourceCodePro_Black );
sitePasswordField.setPaintFlags( userNameField.getPaintFlags() | Paint.SUBPIXEL_TEXT_FLAG );
typeField.setAdapter( new ArrayAdapter<>( this, R.layout.type_item, MPElementType.forClass( MPElementTypeClass.Generated ) ) );
typeField.setAdapter(
new ArrayAdapter<MPElementType>( this, R.layout.type_item, MPElementType.forClass( MPElementTypeClass.Generated ) ) );
typeField.setSelection( MPElementType.GeneratedLong.ordinal() );
counterField.setMinValue( 1 );
@@ -144,7 +147,11 @@ public class EmergencyActivity extends Activity {
public byte[] call()
throws Exception {
try {
return MasterPassword.keyForPassword( masterPassword, userName );
long start = System.currentTimeMillis();
byte[] masterKey = MasterPassword.keyForPassword( masterPassword, userName );
logger.inf( "masterKey time: %d", System.currentTimeMillis() - start );
return masterKey;
}
catch (RuntimeException e) {
sitePasswordField.setText( "" );
@@ -182,7 +189,9 @@ public class EmergencyActivity extends Activity {
@Override
public void run() {
try {
long start = System.currentTimeMillis();
final String sitePassword = MasterPassword.generateContent( type, siteName, masterKeyFuture.get(), counter );
logger.inf( "sitePassword time: %d", System.currentTimeMillis() - start );
runOnUiThread( new Runnable() {
@Override
@@ -212,6 +221,22 @@ public class EmergencyActivity extends Activity {
} );
}
public void copySitePassword(View view) {
String sitePassword = sitePasswordField.getText().toString();
if (sitePassword.isEmpty())
return;
ClipDescription description = new ClipDescription( strf( "Password for %s", siteNameField.getText() ),
new String[]{ ClipDescription.MIMETYPE_TEXT_PLAIN } );
((ClipboardManager) getSystemService( CLIPBOARD_SERVICE )).setPrimaryClip(
new ClipData( description, new ClipData.Item( sitePassword ) ) );
Intent startMain = new Intent(Intent.ACTION_MAIN);
startMain.addCategory(Intent.CATEGORY_HOME);
startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(startMain);
}
private abstract class ValueChangedListener
implements TextWatcher, NumberPicker.OnValueChangeListener, AdapterView.OnItemSelectedListener, View.OnFocusChangeListener {