diff --git a/app/build.gradle b/app/build.gradle index 24f8ea18f..33e2b78a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 20 - buildToolsVersion "20.0.0" + compileSdkVersion 19 + buildToolsVersion "19.1.0" defaultConfig { applicationId "com.zeapo.pwdstore" minSdkVersion 14 - targetSdkVersion 20 + targetSdkVersion 19 versionCode 6 versionName "1.1-b1" } diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index caf72fbf8..36660a512 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -5,6 +5,8 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.PendingIntent; import android.app.ProgressDialog; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -57,6 +59,8 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB private String accountName = ""; SharedPreferences settings; private Activity activity; + ClipboardManager clipboard; + private ProgressDialog bindingDialog; @@ -78,6 +82,7 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB super.onCreate(savedInstanceState); this.activity = this; + this.clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); // some persistance settings = PreferenceManager.getDefaultSharedPreferences(this); @@ -128,6 +133,9 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB setResult(RESULT_OK); finish(); return true; + case R.id.copy_password: + ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", ((TextView) findViewById(R.id.crypto_password_show)).getText()); + clipboard.setPrimaryClip(clip); } return super.onOptionsItemSelected(item); } @@ -212,6 +220,10 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB @Override protected void onPostExecute(Boolean b) { + + ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", "MyPasswordIsDaBest!"); + clipboard.setPrimaryClip(clip); + //clear password ((TextView) findViewById(R.id.crypto_password_show)).setText(""); ((TextView) findViewById(R.id.crypto_extra_show)).setText(""); diff --git a/app/src/main/res/drawable-hdpi/ico_copy.png b/app/src/main/res/drawable-hdpi/ico_copy.png new file mode 100644 index 000000000..d4facfa30 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ico_copy.png differ diff --git a/app/src/main/res/drawable-mdpi/ico_copy.png b/app/src/main/res/drawable-mdpi/ico_copy.png new file mode 100644 index 000000000..b508dccbc Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ico_copy.png differ diff --git a/app/src/main/res/drawable-xhdpi/ico_copy.png b/app/src/main/res/drawable-xhdpi/ico_copy.png new file mode 100644 index 000000000..5dd46582a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ico_copy.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ico_copy.png b/app/src/main/res/drawable-xxhdpi/ico_copy.png new file mode 100644 index 000000000..0269afad4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ico_copy.png differ diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml index f06508f16..f9f88da84 100644 --- a/app/src/main/res/menu/pgp_handler.xml +++ b/app/src/main/res/menu/pgp_handler.xml @@ -1,4 +1,9 @@