aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-06-01 17:43:00 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-06-01 17:43:00 +0530
commit6bc40d12ad44c4170f10054fb8ea7d2c9459da35 (patch)
treea7b79e122d81bb3cd97b870ce38499e0778e9a0a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
parent14a08361e52bcd8bd26b9b2b2b9690276b40ed42 (diff)
downloadopen-keychain-6bc40d12ad44c4170f10054fb8ea7d2c9459da35.tar.gz
open-keychain-6bc40d12ad44c4170f10054fb8ea7d2c9459da35.tar.bz2
open-keychain-6bc40d12ad44c4170f10054fb8ea7d2c9459da35.zip
renamed KeychainIntentService to KeychainService
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java
index a824e73d7..5a3321ac8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java
@@ -40,7 +40,7 @@ public abstract class BaseOperation implements PassphraseCacheInterface {
* of common methods for progress, cancellation and passphrase cache handling.
*
* An "operation" in this sense is a high level operation which is called
- * by the KeychainIntentService or OpenPgpService services. Concrete
+ * by the KeychainService or OpenPgpService services. Concrete
* subclasses of this class should implement either a single or a group of
* related operations. An operation must rely solely on its input
* parameters for operation specifics. It should also write a log of its
@@ -49,7 +49,7 @@ public abstract class BaseOperation implements PassphraseCacheInterface {
*
* An operation must *not* throw exceptions of any kind, errors should be
* handled as part of the OperationResult! Consequently, all handling of
- * errors in KeychainIntentService and OpenPgpService should consist of
+ * errors in KeychainService and OpenPgpService should consist of
* informational rather than operational means.
*
* Note that subclasses of this class should be either Android- or
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
index ff568a9f6..ffce2f39c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
@@ -339,7 +339,7 @@ public class ImportExportOperation extends BaseOperation {
// Special: make sure new data is synced into contacts
// disabling sync right now since it reduces speed while multi-threading
- // so, we expect calling functions to take care of it. KeychainIntentService handles this
+ // so, we expect calling functions to take care of it. KeychainService handles this
// ContactSyncAdapterService.requestSync();
// convert to long array