aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/crypto
diff options
context:
space:
mode:
authorMohamed Zenadi <zeapo@users.noreply.github.com>2014-12-06 18:11:42 +0100
committerMohamed Zenadi <zeapo@users.noreply.github.com>2014-12-06 18:11:42 +0100
commited26a526d340ce8fa6aff9915b6acbb73ff802b9 (patch)
treec2d6c1323af7b6802ac5bdabe2c552fef95e4f94 /app/src/main/java/com/zeapo/pwdstore/crypto
parent1d2398ef85a475d50939b891b8b66bfda8d7237b (diff)
parentad35b453f0a356af6ff6ac2028507d194f09e954 (diff)
downloadHardenedPass-ed26a526d340ce8fa6aff9915b6acbb73ff802b9.tar.gz
HardenedPass-ed26a526d340ce8fa6aff9915b6acbb73ff802b9.zip
Merge pull request #53 from zeapo/feature/recursive-filtering
Filter the passwords recursively
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java6
1 files changed, 1 insertions, 5 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 178224b3..1dfa2047 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -151,7 +151,7 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
clipboard.setPrimaryClip(clip);
try {
showToast(this.getResources().getString(R.string.clipboard_beginning_toast_text)
- + Integer.parseInt(settings.getString("general_show_time", "45"))
+ + " " + Integer.parseInt(settings.getString("general_show_time", "45")) + " "
+ this.getResources().getString(R.string.clipboard_ending_toast_text));
} catch (NumberFormatException e)
{
@@ -322,9 +322,6 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
// encrypt/decrypt/sign/verify
if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) {
try {
- Log.d(OpenPgpApi.TAG, "result: " + os.toByteArray().length
- + " str=" + os.toString("UTF-8"));
-
if (returnToCiphertextField) {
findViewById(R.id.crypto_container).setVisibility(View.VISIBLE);
@@ -380,7 +377,6 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
String mKeys = keyIDs.split(",").length > 1 ? keyIDs : keyIDs.split(",")[0];
// ((TextView) findViewById(R.id.crypto_key_ids)).setText(mKeys);
settings.edit().putString("openpgp_key_ids", keyIDs).apply();
- Log.i("PGP", mKeys);
}
setResult(RESULT_OK);
finish();