diff options
| author | Felix Bechstein <f@ub0r.de> | 2017-07-16 16:41:47 +0200 |
|---|---|---|
| committer | Mohamed Zenadi <zeapo@users.noreply.github.com> | 2017-07-16 16:41:47 +0200 |
| commit | 6ce31056c987b8fd73513d5b4eebc8d0d763a7a2 (patch) | |
| tree | b133cca40f1068b72cf9ae4aefd1a970d82e638c /app/src/main/java | |
| parent | 8e6ab25572571080eae228599af069f78b5ea750 (diff) | |
Show extra content w/o copy password, fixes #288 (#317)
Show extra content even if password is not copied to clipboard.
Add toggle to preferences as well.
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 14 |
1 files changed, 8 insertions, 6 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 683c2561..232c7b94 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -485,15 +485,18 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) { try { if (returnToCiphertextField) { - boolean showPassword = settings.getBoolean("show_password", true); + final boolean showPassword = settings.getBoolean("show_password", true); + final boolean showExtraContent = settings.getBoolean("show_extra_content", true); findViewById(R.id.crypto_container).setVisibility(View.VISIBLE); Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf"); - final String[] passContent = os.toString("UTF-8").split("\n"); + final String[] passContent = os.toString("UTF-8").split("\n", 2); + final String decodedPassword = passContent[0]; + final String extraContent = passContent.length > 1 ? passContent[1] : ""; textViewPassword .setTypeface(monoTypeface); textViewPassword - .setText(passContent[0]); + .setText(decodedPassword); Button toggleVisibilityButton = (Button) findViewById(R.id.crypto_password_toggle_show); toggleVisibilityButton.setVisibility(showPassword?View.GONE:View.VISIBLE); @@ -501,13 +504,12 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne @Override public void run() { textViewPassword - .setText(passContent[0]); + .setText(decodedPassword); } })); - decodedPassword = passContent[0]; - String extraContent = os.toString("UTF-8").replaceFirst(".*\n", ""); if (extraContent.length() != 0) { + findViewById(R.id.crypto_extra_show_layout).setVisibility(showExtraContent ? View.VISIBLE : View.GONE); ((TextView) findViewById(R.id.crypto_extra_show)) .setTypeface(monoTypeface); ((TextView) findViewById(R.id.crypto_extra_show)) |