aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
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/service
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/service')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java)6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
index f9b0227a2..7ce45240a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
@@ -89,7 +89,7 @@ import de.measite.minidns.record.TXT;
* This Service contains all important long lasting operations for OpenKeychain. It receives Intents with
* data from the activities or other apps, executes them, and stops itself after doing them.
*/
-public class KeychainIntentService extends Service implements Progressable {
+public class KeychainService extends Service implements Progressable {
/* extras that can be given by intent */
public static final String EXTRA_MESSENGER = "messenger";
@@ -177,7 +177,7 @@ public class KeychainIntentService extends Service implements Progressable {
private KeyImportAccumulator mKeyImportAccumulator;
- private KeychainIntentService mKeychainService;
+ private KeychainService mKeychainService;
@Override
public IBinder onBind(Intent intent) {
@@ -570,7 +570,7 @@ public class KeychainIntentService extends Service implements Progressable {
} else {
message = e.getMessage();
}
- Log.d(Constants.TAG, "KeychainIntentService Exception: ", e);
+ Log.d(Constants.TAG, "KeychainService Exception: ", e);
Bundle data = new Bundle();
data.putString(ServiceProgressHandler.DATA_ERROR, message);