diff options
| author | Matthew Wong <wongma@protonmail.ch> | 2015-07-18 15:57:19 -0400 |
|---|---|---|
| committer | Matthew Wong <wongma@protonmail.ch> | 2015-07-18 15:57:19 -0400 |
| commit | 01b7b2102dd40ed2bdbad3eefd91a4ed03d10a73 (patch) | |
| tree | 1aadf7abc4e5d4e19a254a265edcfdd2e9f4c9a4 /app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | |
| parent | 8c6142bca6ca825ac937b0faebe38f5b626c283e (diff) | |
| parent | 608f61b6051d8bd03fd75628c225cccb9c0bedde (diff) | |
| download | HardenedPass-01b7b2102dd40ed2bdbad3eefd91a4ed03d10a73.tar.gz HardenedPass-01b7b2102dd40ed2bdbad3eefd91a4ed03d10a73.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 9 |
1 files changed, 6 insertions, 3 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 9c0bc877..2d007618 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -327,17 +327,17 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne if (showPassword) { findViewById(R.id.crypto_container).setVisibility(View.VISIBLE); - Typeface type = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf"); + Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf"); String[] passContent = os.toString("UTF-8").split("\n"); ((TextView) findViewById(R.id.crypto_password_show)) - .setTypeface(type); + .setTypeface(monoTypeface); ((TextView) findViewById(R.id.crypto_password_show)) .setText(passContent[0]); String extraContent = os.toString("UTF-8").replaceFirst(".*\n", ""); if (extraContent.length() != 0) { ((TextView) findViewById(R.id.crypto_extra_show)) - .setTypeface(type); + .setTypeface(monoTypeface); ((TextView) findViewById(R.id.crypto_extra_show)) .setText(extraContent); } @@ -499,6 +499,9 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne decryptAndVerify(new Intent()); } else if (extra.getString("Operation").equals("ENCRYPT")) { setContentView(R.layout.encrypt_layout); + Typeface monoTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodepro.ttf"); + ((EditText) findViewById(R.id.crypto_password_edit)).setTypeface(monoTypeface); + ((EditText) findViewById(R.id.crypto_extra_edit)).setTypeface(monoTypeface); String cat = extra.getString("FILE_PATH"); cat = cat.replace(PasswordRepository.getWorkTree().getAbsolutePath(), ""); cat = cat + "/"; |