diff options
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 19 | ||||
| -rw-r--r-- | app/src/main/res/menu/agp_intents.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/git_clone.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/pgp_handler.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/pwdstore.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/xml/preference.xml | 4 |
6 files changed, 25 insertions, 12 deletions
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 7c6c0da8..f2908ebd 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -145,15 +145,19 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne 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); - showToast("Password copied to clipboard, you have " - + Integer.parseInt(settings.getString("general_show_time", "45")) - + " seconds to paste it somewhere."); + copyToClipBoard(); } return super.onOptionsItemSelected(item); } + public void copyToClipBoard() { + ClipData clip = ClipData.newPlainText("pgp_handler_result_pm", ((TextView) findViewById(R.id.crypto_password_show)).getText()); + clipboard.setPrimaryClip(clip); + showToast("Password copied to clipboard, you have " + + Integer.parseInt(settings.getString("general_show_time", "45")) + + " seconds to paste it somewhere."); + } + public void handleClick(View view) { switch (view.getId()) { case R.id.crypto_show_button: @@ -313,8 +317,6 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { case OpenPgpApi.RESULT_CODE_SUCCESS: { - showToast("SUCCESS"); - // encrypt/decrypt/sign/verify if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) { try { @@ -336,6 +338,9 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne .setText(extraContent); } new DelayShow().execute(); + if (settings.getBoolean("copy_on_decrypt", true)) { + copyToClipBoard(); + } } else { showToast(os.toString()); } diff --git a/app/src/main/res/menu/agp_intents.xml b/app/src/main/res/menu/agp_intents.xml index 591b9525..8aa52dfa 100644 --- a/app/src/main/res/menu/agp_intents.xml +++ b/app/src/main/res/menu/agp_intents.xml @@ -1,8 +1,9 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:pwstore="http://schemas.android.com/apk/res-auto" tools:context="com.zeapo.pwdstore.AgpIntentsActivity" > <item android:id="@+id/action_settings" android:title="@string/action_settings" android:orderInCategory="100" - android:showAsAction="never" /> + pwstore:showAsAction="never" /> </menu> diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml index fa9dbf1c..e414f0b9 100644 --- a/app/src/main/res/menu/git_clone.xml +++ b/app/src/main/res/menu/git_clone.xml @@ -1,8 +1,9 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:pwstore="http://schemas.android.com/apk/res-auto" tools:context="com.zeapo.pwdstore.GitHandler" > <item android:id="@+id/user_pref" android:title="@string/action_settings" android:orderInCategory="100" - android:showAsAction="never" /> + pwstore:showAsAction="never" /> </menu> diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml index f9f88da8..fac4e163 100644 --- a/app/src/main/res/menu/pgp_handler.xml +++ b/app/src/main/res/menu/pgp_handler.xml @@ -1,9 +1,10 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:pwstore="http://schemas.android.com/apk/res-auto" tools:context="com.zeapo.pwdstore.crypto.PgpHandler" > <item android:title="Copy password" android:icon="@drawable/ico_copy" - android:showAsAction="ifRoom" + pwstore:showAsAction="ifRoom" android:id="@+id/copy_password" /> </menu> diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml index 957a4795..d6f81b73 100644 --- a/app/src/main/res/menu/pwdstore.xml +++ b/app/src/main/res/menu/pwdstore.xml @@ -1,10 +1,11 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:pwstore="http://schemas.android.com/apk/res-auto" tools:context=".pwdstore" > <item android:id="@+id/menu_add_password" android:icon="@drawable/ico_add" - android:showAsAction="always" + pwstore:showAsAction="always" android:title="New password"/> <!--<item android:id="@+id/menu_add_category"--> @@ -17,7 +18,7 @@ <item android:id="@+id/refresh" android:title="Refresh list" - android:showAsAction="never" + pwstore:showAsAction="never" android:icon="@drawable/ico_sync"/> <item android:id="@+id/user_pref" diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index 56a16f49..0833ebf8 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -30,5 +30,9 @@ android:dialogTitle="Set the time you want the password to be in clipboard" android:summary="Set the time you want the password to be in clipboard" android:hint="45" android:key="general_show_time" /> + <CheckBoxPreference android:title="Automatically Copy Password" + android:dialogTitle="Automatically copy the password to the clipboard after decryption was successful." + android:summary="Automatically copy the password to the clipboard after decryption was successful." + android:key="copy_on_decrypt" android:defaultValue="true" /> </PreferenceCategory> </PreferenceScreen>
\ No newline at end of file |