aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
diff options
context:
space:
mode:
authorDaniel Hammann <github@honnel.de>2014-03-11 00:12:45 +0100
committerDaniel Hammann <github@honnel.de>2014-03-11 00:12:45 +0100
commit77ebfd08758ddd0383b2d235916284640f9f0aa9 (patch)
treedc3a20d09e619a14081ccf2996bc85a92cb784ac /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
parent506782b6890c2aa41adf0042d64c0f24e28975f1 (diff)
parent3f5de1eac6633f906a7063fe7a6b6d43e9f63a24 (diff)
downloadopen-keychain-77ebfd08758ddd0383b2d235916284640f9f0aa9.tar.gz
open-keychain-77ebfd08758ddd0383b2d235916284640f9f0aa9.tar.bz2
open-keychain-77ebfd08758ddd0383b2d235916284640f9f0aa9.zip
Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index c111ed33b..76acf15b0 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -646,7 +646,7 @@ public class DecryptActivity extends DrawerActivity {
// Message is received after encrypting is done in ApgService
KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
- R.string.progress_decrypting, ProgressDialog.STYLE_HORIZONTAL) {
+ getString(R.string.progress_decrypting), ProgressDialog.STYLE_HORIZONTAL) {
public void handleMessage(Message message) {
// handle messages by standard ApgHandler first
super.handleMessage(message);