aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-03-25 19:11:32 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-03-25 19:11:32 +0100
commit7111a4265d1c6dd58f725a2e2ceed536e65c8354 (patch)
treeeb4091143693be071d5d5b41b4a9faa259fee20b /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper
parentaa35b1f4b5a5198482c9c5a659d357b3ac9a101b (diff)
parent41fc7b6344420771a229a12c3f3b6aa257e0e31a (diff)
downloadopen-keychain-7111a4265d1c6dd58f725a2e2ceed536e65c8354.tar.gz
open-keychain-7111a4265d1c6dd58f725a2e2ceed536e65c8354.tar.bz2
open-keychain-7111a4265d1c6dd58f725a2e2ceed536e65c8354.zip
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
index 2bfa796c7..cc240a67b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
@@ -139,7 +139,7 @@ public class ExportHelper {
intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
- // Message is received after exporting is done in ApgService
+ // Message is received after exporting is done in KeychainIntentService
KeychainIntentServiceHandler exportHandler = new KeychainIntentServiceHandler(mActivity,
mActivity.getString(R.string.progress_exporting),
ProgressDialog.STYLE_HORIZONTAL,
@@ -151,7 +151,7 @@ public class ExportHelper {
}
}) {
public void handleMessage(Message message) {
- // handle messages by standard ApgHandler first
+ // handle messages by standard KeychainIntentServiceHandler first
super.handleMessage(message);
if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {